@storm-software/cloudflare-tools 0.71.8 → 0.71.10
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 +21 -0
- package/README.md +1 -2
- package/dist/{chunk-3AKRXUUE.js → chunk-BZEJDZ2M.js} +4 -4
- package/dist/{chunk-QDPNOX6S.mjs → chunk-DXU4ZYCE.mjs} +1 -1
- package/dist/{chunk-VNUNYZX4.js → chunk-GG44TH3K.js} +4 -4
- package/dist/{chunk-G4SKWFFU.mjs → chunk-HTH2JCTQ.mjs} +9 -7
- package/dist/{chunk-2SRZ2J7D.js → chunk-KMNS6S6D.js} +5 -3
- package/dist/{chunk-QRMW3ECS.mjs → chunk-NRILXPPG.mjs} +4 -4
- package/dist/executors.js +1 -1
- package/dist/executors.mjs +1 -1
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +2 -2
- package/dist/index.js +4 -4
- package/dist/index.mjs +3 -3
- package/dist/src/executors/r2-upload-publish/executor.js +2 -2
- package/dist/src/executors/r2-upload-publish/executor.mjs +1 -1
- package/dist/src/generators/init/generator.js +2 -2
- package/dist/src/generators/init/generator.mjs +1 -1
- package/dist/src/generators/worker/generator.js +3 -3
- package/dist/src/generators/worker/generator.mjs +2 -2
- package/package.json +5 -5
- package/dist/chunk-H5H4H2SO.js +0 -262
- package/dist/chunk-K5JUOE3A.js +0 -219
- package/dist/chunk-WSBHUYOP.mjs +0 -219
- package/dist/chunk-Z52YIFDR.mjs +0 -265
package/dist/chunk-Z52YIFDR.mjs
DELETED
|
@@ -1,265 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
findWorkspaceRoot,
|
|
3
|
-
getConfig
|
|
4
|
-
} from "./chunk-SGTAZO2Q.mjs";
|
|
5
|
-
import {
|
|
6
|
-
getStopwatch,
|
|
7
|
-
writeDebug,
|
|
8
|
-
writeError,
|
|
9
|
-
writeFatal,
|
|
10
|
-
writeInfo,
|
|
11
|
-
writeTrace
|
|
12
|
-
} from "./chunk-TPNHSNNZ.mjs";
|
|
13
|
-
import {
|
|
14
|
-
generator_default
|
|
15
|
-
} from "./chunk-QRMW3ECS.mjs";
|
|
16
|
-
import {
|
|
17
|
-
__dirname
|
|
18
|
-
} from "./chunk-TYYFTZLS.mjs";
|
|
19
|
-
|
|
20
|
-
// src/generators/worker/generator.ts
|
|
21
|
-
import {
|
|
22
|
-
convertNxGenerator,
|
|
23
|
-
ensurePackage,
|
|
24
|
-
formatFiles,
|
|
25
|
-
generateFiles,
|
|
26
|
-
joinPathFragments,
|
|
27
|
-
names,
|
|
28
|
-
readProjectConfiguration,
|
|
29
|
-
runTasksInSerial,
|
|
30
|
-
updateJson,
|
|
31
|
-
updateProjectConfiguration
|
|
32
|
-
} from "@nx/devkit";
|
|
33
|
-
import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
|
|
34
|
-
import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
|
|
35
|
-
import { nxVersion } from "@nx/node/src/utils/versions";
|
|
36
|
-
import { join } from "path";
|
|
37
|
-
|
|
38
|
-
// src/generators/worker/libs/get-account-id.ts
|
|
39
|
-
function getAccountId(accountId) {
|
|
40
|
-
return `account_id = "${accountId}"`;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
// src/generators/worker/libs/vitest-imports.ts
|
|
44
|
-
var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
|
|
45
|
-
|
|
46
|
-
// src/generators/worker/libs/vitest-script.ts
|
|
47
|
-
var vitestScript = `"test": "vitest run"`;
|
|
48
|
-
|
|
49
|
-
// src/generators/worker/generator.ts
|
|
50
|
-
async function applicationGenerator(tree, schema) {
|
|
51
|
-
const stopwatch = getStopwatch("Storm Worker generator");
|
|
52
|
-
let config;
|
|
53
|
-
try {
|
|
54
|
-
writeInfo(`\u26A1 Running the Storm Worker generator...
|
|
55
|
-
|
|
56
|
-
`, config);
|
|
57
|
-
const workspaceRoot = findWorkspaceRoot();
|
|
58
|
-
writeDebug(
|
|
59
|
-
`Loading the Storm Config from environment variables and storm.json file...
|
|
60
|
-
- workspaceRoot: ${workspaceRoot}`,
|
|
61
|
-
config
|
|
62
|
-
);
|
|
63
|
-
config = await getConfig(workspaceRoot);
|
|
64
|
-
writeTrace(
|
|
65
|
-
`Loaded Storm config into env:
|
|
66
|
-
${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
|
|
67
|
-
config
|
|
68
|
-
);
|
|
69
|
-
const options = await normalizeOptions(tree, schema, config);
|
|
70
|
-
const tasks = [];
|
|
71
|
-
tasks.push(
|
|
72
|
-
await generator_default(tree, {
|
|
73
|
-
...options,
|
|
74
|
-
skipFormat: true
|
|
75
|
-
})
|
|
76
|
-
);
|
|
77
|
-
tasks.push(
|
|
78
|
-
await nodeApplicationGenerator(tree, {
|
|
79
|
-
...options,
|
|
80
|
-
framework: "none",
|
|
81
|
-
skipFormat: true,
|
|
82
|
-
unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
|
|
83
|
-
e2eTestRunner: "none",
|
|
84
|
-
name: schema.name
|
|
85
|
-
})
|
|
86
|
-
);
|
|
87
|
-
if (options.unitTestRunner === "vitest") {
|
|
88
|
-
const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
|
|
89
|
-
"@nx/vite",
|
|
90
|
-
nxVersion
|
|
91
|
-
);
|
|
92
|
-
const vitestTask = await vitestGenerator(tree, {
|
|
93
|
-
project: options.name,
|
|
94
|
-
uiFramework: "none",
|
|
95
|
-
coverageProvider: "v8",
|
|
96
|
-
skipFormat: true,
|
|
97
|
-
testEnvironment: "node"
|
|
98
|
-
});
|
|
99
|
-
tasks.push(vitestTask);
|
|
100
|
-
createOrEditViteConfig(
|
|
101
|
-
tree,
|
|
102
|
-
{
|
|
103
|
-
project: options.name,
|
|
104
|
-
includeLib: false,
|
|
105
|
-
includeVitest: true,
|
|
106
|
-
testEnvironment: "node"
|
|
107
|
-
},
|
|
108
|
-
true
|
|
109
|
-
);
|
|
110
|
-
}
|
|
111
|
-
addCloudflareFiles(tree, options);
|
|
112
|
-
updateTsAppConfig(tree, options);
|
|
113
|
-
addTargets(tree, options);
|
|
114
|
-
if (options.unitTestRunner === "none") {
|
|
115
|
-
removeTestFiles(tree, options);
|
|
116
|
-
}
|
|
117
|
-
if (!options.skipFormat) {
|
|
118
|
-
await formatFiles(tree);
|
|
119
|
-
}
|
|
120
|
-
if (options.template === "hono") {
|
|
121
|
-
tasks.push(() => {
|
|
122
|
-
const packageJsonPath = joinPathFragments(
|
|
123
|
-
options.directory ?? "",
|
|
124
|
-
"package.json"
|
|
125
|
-
);
|
|
126
|
-
if (tree.exists(packageJsonPath)) {
|
|
127
|
-
updateJson(tree, packageJsonPath, (json) => ({
|
|
128
|
-
...json,
|
|
129
|
-
dependencies: {
|
|
130
|
-
hono: "4.4.0",
|
|
131
|
-
...json?.dependencies
|
|
132
|
-
}
|
|
133
|
-
}));
|
|
134
|
-
}
|
|
135
|
-
});
|
|
136
|
-
}
|
|
137
|
-
return runTasksInSerial(...tasks);
|
|
138
|
-
} catch (error) {
|
|
139
|
-
return () => {
|
|
140
|
-
writeFatal(
|
|
141
|
-
"A fatal error occurred while running the generator - the process was forced to terminate",
|
|
142
|
-
config
|
|
143
|
-
);
|
|
144
|
-
writeError(
|
|
145
|
-
`An exception was thrown in the generator's process
|
|
146
|
-
- Details: ${error.message}
|
|
147
|
-
- Stacktrace: ${error.stack}`,
|
|
148
|
-
config
|
|
149
|
-
);
|
|
150
|
-
};
|
|
151
|
-
} finally {
|
|
152
|
-
stopwatch();
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
function updateTsAppConfig(tree, options) {
|
|
156
|
-
updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
|
|
157
|
-
json.compilerOptions = {
|
|
158
|
-
...json.compilerOptions,
|
|
159
|
-
esModuleInterop: true,
|
|
160
|
-
target: "es2021",
|
|
161
|
-
lib: ["es2021"],
|
|
162
|
-
module: "es2022",
|
|
163
|
-
moduleResolution: "node",
|
|
164
|
-
resolveJsonModule: true,
|
|
165
|
-
allowJs: true,
|
|
166
|
-
checkJs: false,
|
|
167
|
-
noEmit: true,
|
|
168
|
-
isolatedModules: true,
|
|
169
|
-
allowSyntheticDefaultImports: true,
|
|
170
|
-
forceConsistentCasingInFileNames: true,
|
|
171
|
-
strict: true,
|
|
172
|
-
skipLibCheck: true
|
|
173
|
-
};
|
|
174
|
-
json.compilerOptions.types = [
|
|
175
|
-
...json.compilerOptions.types,
|
|
176
|
-
"@cloudflare/workers-types"
|
|
177
|
-
];
|
|
178
|
-
return json;
|
|
179
|
-
});
|
|
180
|
-
}
|
|
181
|
-
function addCloudflareFiles(tree, options) {
|
|
182
|
-
tree.delete(join(options.appProjectRoot, "src/main.ts"));
|
|
183
|
-
generateFiles(
|
|
184
|
-
tree,
|
|
185
|
-
join(__dirname, "./files/common"),
|
|
186
|
-
options.appProjectRoot,
|
|
187
|
-
{
|
|
188
|
-
...options,
|
|
189
|
-
tmpl: "",
|
|
190
|
-
name: options.name,
|
|
191
|
-
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
192
|
-
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
|
|
193
|
-
}
|
|
194
|
-
);
|
|
195
|
-
if (options.template && options.template !== "none") {
|
|
196
|
-
generateFiles(
|
|
197
|
-
tree,
|
|
198
|
-
join(__dirname, `./files/${options.template}`),
|
|
199
|
-
join(options.appProjectRoot, "src"),
|
|
200
|
-
{
|
|
201
|
-
...options,
|
|
202
|
-
tmpl: "",
|
|
203
|
-
name: options.name,
|
|
204
|
-
accountId: options.accountId ? getAccountId(options.accountId) : "",
|
|
205
|
-
vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
|
|
206
|
-
vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
|
|
207
|
-
}
|
|
208
|
-
);
|
|
209
|
-
}
|
|
210
|
-
}
|
|
211
|
-
function addTargets(tree, options) {
|
|
212
|
-
try {
|
|
213
|
-
const projectConfiguration = readProjectConfiguration(tree, options.name);
|
|
214
|
-
projectConfiguration.targets = {
|
|
215
|
-
...projectConfiguration.targets ?? {},
|
|
216
|
-
serve: {
|
|
217
|
-
executor: "@storm-software/cloudflare-tools:serve",
|
|
218
|
-
options: {
|
|
219
|
-
port: options.port
|
|
220
|
-
}
|
|
221
|
-
},
|
|
222
|
-
"nx-release-publish": {
|
|
223
|
-
executor: "@storm-software/cloudflare-tools:cloudflare-publish"
|
|
224
|
-
}
|
|
225
|
-
};
|
|
226
|
-
if (projectConfiguration.targets.build) {
|
|
227
|
-
delete projectConfiguration.targets.build;
|
|
228
|
-
}
|
|
229
|
-
updateProjectConfiguration(tree, options.name, projectConfiguration);
|
|
230
|
-
} catch (e) {
|
|
231
|
-
console.error(e);
|
|
232
|
-
}
|
|
233
|
-
}
|
|
234
|
-
function removeTestFiles(tree, options) {
|
|
235
|
-
tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
|
|
236
|
-
}
|
|
237
|
-
async function normalizeOptions(host, options, config) {
|
|
238
|
-
const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
|
|
239
|
-
name: options.name,
|
|
240
|
-
projectType: "application",
|
|
241
|
-
directory: options.directory,
|
|
242
|
-
rootProject: options.rootProject
|
|
243
|
-
});
|
|
244
|
-
options.rootProject = appProjectRoot === ".";
|
|
245
|
-
return {
|
|
246
|
-
addPlugin: process.env.NX_ADD_PLUGINS !== "false",
|
|
247
|
-
accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
|
|
248
|
-
...options,
|
|
249
|
-
name: names(appProjectName).fileName,
|
|
250
|
-
frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
|
|
251
|
-
appProjectRoot,
|
|
252
|
-
unitTestRunner: options.unitTestRunner ?? "vitest",
|
|
253
|
-
rootProject: options.rootProject ?? false,
|
|
254
|
-
template: options.template ?? "fetch-handler",
|
|
255
|
-
port: options.port ?? 3e3
|
|
256
|
-
};
|
|
257
|
-
}
|
|
258
|
-
var generator_default2 = applicationGenerator;
|
|
259
|
-
var applicationSchematic = convertNxGenerator(applicationGenerator);
|
|
260
|
-
|
|
261
|
-
export {
|
|
262
|
-
applicationGenerator,
|
|
263
|
-
generator_default2 as generator_default,
|
|
264
|
-
applicationSchematic
|
|
265
|
-
};
|