@storm-software/cloudflare-tools 0.71.17 → 0.71.19
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 +37 -0
- package/README.md +2 -1
- package/dist/{chunk-I5PY5AIW.js → chunk-25Q25WAF.js} +4 -2
- package/dist/{chunk-GVXVF7SH.js → chunk-2Q2XFRC4.js} +5 -5
- package/dist/{chunk-VKMAYBQX.js → chunk-5GILNZWS.js} +1 -3
- package/dist/{chunk-S35AG7YC.js → chunk-CXYT523M.js} +4 -4
- package/dist/{chunk-SGTAZO2Q.mjs → chunk-G4ZCI2MN.mjs} +1 -3
- package/dist/{chunk-J5JJZJO5.js → chunk-IVVRVG36.js} +13 -13
- package/dist/{chunk-XXRW4LKE.js → chunk-MVMFQZFI.js} +5 -5
- package/dist/{chunk-NFW7NCBF.mjs → chunk-NIOOY3TB.mjs} +1 -1
- package/dist/{chunk-4DD7MPRF.mjs → chunk-PFHLUKVX.mjs} +4 -2
- package/dist/{chunk-73RSHCRP.mjs → chunk-UFFSVT2P.mjs} +2 -2
- package/dist/{chunk-BWV37GOJ.mjs → chunk-UJ245ZHH.mjs} +4 -4
- package/dist/{chunk-GMB6XFTP.mjs → chunk-WZ5BU6WQ.mjs} +2 -2
- package/dist/executors.js +4 -4
- package/dist/executors.mjs +4 -4
- package/dist/generators.js +4 -4
- package/dist/generators.mjs +3 -3
- package/dist/index.js +7 -7
- package/dist/index.mjs +6 -6
- package/dist/src/executors/cloudflare-publish/executor.js +2 -2
- package/dist/src/executors/cloudflare-publish/executor.mjs +2 -2
- package/dist/src/executors/r2-upload-publish/executor.js +4 -4
- package/dist/src/executors/r2-upload-publish/executor.mjs +3 -3
- package/dist/src/executors/serve/executor.js +3 -3
- package/dist/src/executors/serve/executor.mjs +2 -2
- 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 +4 -4
- package/dist/src/generators/worker/generator.mjs +3 -3
- package/dist/src/generators/worker/schema.d.ts +1 -1
- package/dist/src/utils/http-handler.d.mts +1 -1
- package/dist/src/utils/http-handler.d.ts +1 -1
- package/dist/src/utils/http-handler.js +2 -2
- package/dist/src/utils/http-handler.mjs +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,43 @@
|
|
|
2
2
|
|
|
3
3
|
# Changelog for Storm Ops - Cloudflare Tools
|
|
4
4
|
|
|
5
|
+
## [0.71.18](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.18) (12/15/2025)
|
|
6
|
+
|
|
7
|
+
### Miscellaneous
|
|
8
|
+
|
|
9
|
+
- **monorepo:** Format repository source files
|
|
10
|
+
([6415008e9](https://github.com/storm-software/storm-ops/commit/6415008e9))
|
|
11
|
+
- **monorepo:** Format workspace source files
|
|
12
|
+
([b957f4850](https://github.com/storm-software/storm-ops/commit/b957f4850))
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- **cloudflare-tools:** Increase the HTTP handlers timeout
|
|
17
|
+
([7195a7dc6](https://github.com/storm-software/storm-ops/commit/7195a7dc6))
|
|
18
|
+
|
|
19
|
+
### Updated Dependencies
|
|
20
|
+
|
|
21
|
+
- Updated **workspace-tools** to **v1.294.11**
|
|
22
|
+
- Updated **config-tools** to **v1.188.67**
|
|
23
|
+
- Updated **config** to **v1.134.67**
|
|
24
|
+
|
|
25
|
+
## [0.71.17](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.17) (12/15/2025)
|
|
26
|
+
|
|
27
|
+
### Miscellaneous
|
|
28
|
+
|
|
29
|
+
- **monorepo:** Update workspace packages' dependencies
|
|
30
|
+
([867ba2a4c](https://github.com/storm-software/storm-ops/commit/867ba2a4c))
|
|
31
|
+
- **monorepo:** Regenerate pnpm-lock file
|
|
32
|
+
([2f9b43b91](https://github.com/storm-software/storm-ops/commit/2f9b43b91))
|
|
33
|
+
- **monorepo:** Update workspace packages' dependencies
|
|
34
|
+
([104422be0](https://github.com/storm-software/storm-ops/commit/104422be0))
|
|
35
|
+
|
|
36
|
+
### Updated Dependencies
|
|
37
|
+
|
|
38
|
+
- Updated **workspace-tools** to **v1.294.10**
|
|
39
|
+
- Updated **config-tools** to **v1.188.66**
|
|
40
|
+
- Updated **config** to **v1.134.66**
|
|
41
|
+
|
|
5
42
|
## [0.71.16](https://github.com/storm-software/storm-ops/releases/tag/cloudflare-tools%400.71.16) (12/08/2025)
|
|
6
43
|
|
|
7
44
|
### 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
|
-
[](https://prettier.io/) [](http://nx.dev/) [](https://nextjs.org/) [](http://commitizen.github.io/cz-cli/)  [](https://fumadocs.vercel.app/) 
|
|
31
31
|
|
|
32
32
|
<!-- prettier-ignore-start -->
|
|
33
33
|
<!-- markdownlint-disable -->
|
|
@@ -46,6 +46,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
|
|
|
46
46
|
|
|
47
47
|
<!-- START doctoc -->
|
|
48
48
|
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
|
|
49
|
+
|
|
49
50
|
## Table of Contents
|
|
50
51
|
|
|
51
52
|
- [Storm Cloudflare Tools](#storm-cloudflare-tools)
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
var _nodehttphandler = require('@smithy/node-http-handler');
|
|
3
3
|
function createHttpHandler() {
|
|
4
4
|
return new (0, _nodehttphandler.NodeHttp2Handler)({
|
|
5
|
-
requestTimeout:
|
|
6
|
-
|
|
5
|
+
requestTimeout: 20 * 60 * 1e3,
|
|
6
|
+
// 20 minutes
|
|
7
|
+
sessionTimeout: 30 * 60 * 1e3
|
|
8
|
+
// 30 minutes
|
|
7
9
|
});
|
|
8
10
|
}
|
|
9
11
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
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
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunk25Q25WAFjs = require('./chunk-25Q25WAF.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
@@ -12,7 +12,7 @@ var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
|
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
15
|
-
var
|
|
15
|
+
var _chunk5GILNZWSjs = require('./chunk-5GILNZWS.js');
|
|
16
16
|
|
|
17
17
|
|
|
18
18
|
|
|
@@ -48,8 +48,8 @@ async function runExecutor(options, context) {
|
|
|
48
48
|
throw new Error("The executor requires projectsConfigurations.");
|
|
49
49
|
}
|
|
50
50
|
try {
|
|
51
|
-
const workspaceRoot =
|
|
52
|
-
const config = await
|
|
51
|
+
const workspaceRoot = _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, );
|
|
52
|
+
const config = await _chunk5GILNZWSjs.getConfig.call(void 0, workspaceRoot);
|
|
53
53
|
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.name]), () => ( context.projectName));
|
|
54
54
|
const projectDetails = _chunkN7FW365Qjs.getPackageInfo.call(void 0,
|
|
55
55
|
context.projectsConfigurations.projects[context.projectName]
|
|
@@ -99,7 +99,7 @@ async function runExecutor(options, context) {
|
|
|
99
99
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
100
100
|
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
|
|
101
101
|
},
|
|
102
|
-
requestHandler:
|
|
102
|
+
requestHandler: _chunk25Q25WAFjs.createHttpHandler.call(void 0, )
|
|
103
103
|
});
|
|
104
104
|
const version = _optionalChain([projectDetails, 'optionalAccess', _13 => _13.content, 'optionalAccess', _14 => _14.version]);
|
|
105
105
|
if (version) {
|
|
@@ -21,9 +21,7 @@ function findFolderUp(startPath, endFileNames = [], endDirectoryNames = []) {
|
|
|
21
21
|
)) {
|
|
22
22
|
return _startPath;
|
|
23
23
|
}
|
|
24
|
-
if (endFileNames.some(
|
|
25
|
-
(endFileName) => _fs.existsSync.call(void 0, _path.join.call(void 0, _startPath, endFileName))
|
|
26
|
-
)) {
|
|
24
|
+
if (endFileNames.some((endFileName) => _fs.existsSync.call(void 0, _path.join.call(void 0, _startPath, endFileName)))) {
|
|
27
25
|
return _startPath;
|
|
28
26
|
}
|
|
29
27
|
if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
|
|
@@ -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.
|
|
10
|
+
version: "0.71.18",
|
|
11
11
|
description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
12
12
|
repository: {
|
|
13
13
|
type: "github",
|
|
@@ -136,9 +136,9 @@ var require_package = _chunkMCKGQKYUjs.__commonJS.call(void 0, {
|
|
|
136
136
|
"@nx/js": "catalog:",
|
|
137
137
|
"@nx/node": "catalog:",
|
|
138
138
|
"@nx/web": "catalog:",
|
|
139
|
-
"@storm-software/config": "1.134.
|
|
140
|
-
"@storm-software/config-tools": "1.188.
|
|
141
|
-
"@storm-software/workspace-tools": "1.294.
|
|
139
|
+
"@storm-software/config": "1.134.67",
|
|
140
|
+
"@storm-software/config-tools": "1.188.67",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.11",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -21,9 +21,7 @@ function findFolderUp(startPath, endFileNames = [], endDirectoryNames = []) {
|
|
|
21
21
|
)) {
|
|
22
22
|
return _startPath;
|
|
23
23
|
}
|
|
24
|
-
if (endFileNames.some(
|
|
25
|
-
(endFileName) => existsSync(join(_startPath, endFileName))
|
|
26
|
-
)) {
|
|
24
|
+
if (endFileNames.some((endFileName) => existsSync(join(_startPath, endFileName)))) {
|
|
27
25
|
return _startPath;
|
|
28
26
|
}
|
|
29
27
|
if (_startPath !== "/" && depth++ < MAX_PATH_SEARCH_DEPTH) {
|
|
@@ -8,7 +8,7 @@ var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
11
|
+
var _chunk5GILNZWSjs = require('./chunk-5GILNZWS.js');
|
|
12
12
|
|
|
13
13
|
|
|
14
14
|
|
|
@@ -60,7 +60,7 @@ var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
|
60
60
|
if (result.includes("{workspaceRoot}")) {
|
|
61
61
|
result = result.replaceAll(
|
|
62
62
|
"{workspaceRoot}",
|
|
63
|
-
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => (
|
|
63
|
+
_nullishCoalesce(_nullishCoalesce(tokenParams.workspaceRoot, () => ( _optionalChain([tokenParams, 'access', _3 => _3.config, 'optionalAccess', _4 => _4.workspaceRoot]))), () => ( _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, )))
|
|
64
64
|
);
|
|
65
65
|
}
|
|
66
66
|
return result;
|
|
@@ -109,7 +109,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
109
109
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
110
110
|
);
|
|
111
111
|
}
|
|
112
|
-
const workspaceRoot2 =
|
|
112
|
+
const workspaceRoot2 = _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, );
|
|
113
113
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot2;
|
|
114
114
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot2;
|
|
115
115
|
const projectName = context.projectName;
|
|
@@ -125,7 +125,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
125
125
|
`,
|
|
126
126
|
config
|
|
127
127
|
);
|
|
128
|
-
config = await
|
|
128
|
+
config = await _chunk5GILNZWSjs.getConfig.call(void 0, workspaceRoot2);
|
|
129
129
|
}
|
|
130
130
|
if (_optionalChain([executorOptions, 'optionalAccess', _7 => _7.hooks, 'optionalAccess', _8 => _8.applyDefaultOptions])) {
|
|
131
131
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -660,7 +660,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
660
660
|
return packageJson;
|
|
661
661
|
};
|
|
662
662
|
var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceRoot, projectName, includeSrc = false, packageJson) => {
|
|
663
|
-
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot :
|
|
663
|
+
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot : _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, );
|
|
664
664
|
const workspacePackageJsonContent = await _promises.readFile.call(void 0,
|
|
665
665
|
_chunkZ2WQB55Rjs.joinPaths.call(void 0, workspaceRoot2, "package.json"),
|
|
666
666
|
"utf8"
|
|
@@ -837,7 +837,7 @@ async function resolveContext(userOptions) {
|
|
|
837
837
|
if (!workspaceRoot2) {
|
|
838
838
|
throw new Error("Cannot find Nx workspace root");
|
|
839
839
|
}
|
|
840
|
-
const workspaceConfig = await
|
|
840
|
+
const workspaceConfig = await _chunk5GILNZWSjs.getWorkspaceConfig.call(void 0, true, {
|
|
841
841
|
workspaceRoot: workspaceRoot2.dir
|
|
842
842
|
});
|
|
843
843
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -1402,11 +1402,11 @@ function toTSDownFormat(format3) {
|
|
|
1402
1402
|
// ../tsdown/src/build.ts
|
|
1403
1403
|
var resolveOptions = async (userOptions) => {
|
|
1404
1404
|
const options = getDefaultOptions(userOptions);
|
|
1405
|
-
const workspaceRoot2 =
|
|
1405
|
+
const workspaceRoot2 = _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, options.projectRoot);
|
|
1406
1406
|
if (!workspaceRoot2) {
|
|
1407
1407
|
throw new Error("Cannot find Nx workspace root");
|
|
1408
1408
|
}
|
|
1409
|
-
const workspaceConfig = await
|
|
1409
|
+
const workspaceConfig = await _chunk5GILNZWSjs.getWorkspaceConfig.call(void 0, options.debug === true, {
|
|
1410
1410
|
workspaceRoot: workspaceRoot2
|
|
1411
1411
|
});
|
|
1412
1412
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -1833,14 +1833,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
|
1833
1833
|
_chunkZ2WQB55Rjs.writeInfo.call(void 0, `\u26A1 Running the ${name} generator...
|
|
1834
1834
|
|
|
1835
1835
|
`, config);
|
|
1836
|
-
const workspaceRoot2 =
|
|
1836
|
+
const workspaceRoot2 = _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, );
|
|
1837
1837
|
if (!generatorOptions.skipReadingConfig) {
|
|
1838
1838
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
1839
1839
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
1840
1840
|
- workspaceRoot: ${workspaceRoot2}`,
|
|
1841
1841
|
config
|
|
1842
1842
|
);
|
|
1843
|
-
config = await
|
|
1843
|
+
config = await _chunk5GILNZWSjs.getConfig.call(void 0, workspaceRoot2);
|
|
1844
1844
|
}
|
|
1845
1845
|
if (_optionalChain([generatorOptions, 'optionalAccess', _120 => _120.hooks, 'optionalAccess', _121 => _121.applyDefaultOptions])) {
|
|
1846
1846
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -2310,9 +2310,9 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
2310
2310
|
`Determining the Storm Workspace Configuration JSON Schema...`,
|
|
2311
2311
|
config
|
|
2312
2312
|
);
|
|
2313
|
-
const jsonSchema = z.toJSONSchema(
|
|
2313
|
+
const jsonSchema = z.toJSONSchema(_chunk5GILNZWSjs.workspaceConfigSchema, {
|
|
2314
2314
|
target: "draft-7",
|
|
2315
|
-
metadata:
|
|
2315
|
+
metadata: _chunk5GILNZWSjs.schemaRegistry
|
|
2316
2316
|
});
|
|
2317
2317
|
jsonSchema.$id ??= "https://public.storm-cdn.com/schemas/storm-workspace.schema.json";
|
|
2318
2318
|
jsonSchema.title ??= "Storm Workspace Configuration JSON Schema";
|
|
@@ -2324,7 +2324,7 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
2324
2324
|
);
|
|
2325
2325
|
}
|
|
2326
2326
|
const outputPath = options.outputFile.replaceAll("{workspaceRoot}", "").replaceAll(
|
|
2327
|
-
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _160 => _160.workspaceRoot]), () => (
|
|
2327
|
+
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _160 => _160.workspaceRoot]), () => ( _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, ))),
|
|
2328
2328
|
options.outputFile.startsWith("./") ? "" : "./"
|
|
2329
2329
|
);
|
|
2330
2330
|
_chunkZ2WQB55Rjs.writeTrace.call(void 0,
|
|
@@ -1,10 +1,10 @@
|
|
|
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
|
|
3
|
+
var _chunkCXYT523Mjs = require('./chunk-CXYT523M.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunk5GILNZWSjs = require('./chunk-5GILNZWS.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -51,13 +51,13 @@ async function applicationGenerator(tree, schema) {
|
|
|
51
51
|
_chunkZ2WQB55Rjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
|
|
52
52
|
|
|
53
53
|
`, config);
|
|
54
|
-
const workspaceRoot =
|
|
54
|
+
const workspaceRoot = _chunk5GILNZWSjs.findWorkspaceRoot.call(void 0, );
|
|
55
55
|
_chunkZ2WQB55Rjs.writeDebug.call(void 0,
|
|
56
56
|
`Loading the Storm Config from environment variables and storm.json file...
|
|
57
57
|
- workspaceRoot: ${workspaceRoot}`,
|
|
58
58
|
config
|
|
59
59
|
);
|
|
60
|
-
config = await
|
|
60
|
+
config = await _chunk5GILNZWSjs.getConfig.call(void 0, workspaceRoot);
|
|
61
61
|
_chunkZ2WQB55Rjs.writeTrace.call(void 0,
|
|
62
62
|
`Loaded Storm config into env:
|
|
63
63
|
${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
|
|
@@ -66,7 +66,7 @@ ${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[
|
|
|
66
66
|
const options = await normalizeOptions(tree, schema, config);
|
|
67
67
|
const tasks = [];
|
|
68
68
|
tasks.push(
|
|
69
|
-
await
|
|
69
|
+
await _chunkCXYT523Mjs.generator_default.call(void 0, tree, {
|
|
70
70
|
...options,
|
|
71
71
|
skipFormat: true
|
|
72
72
|
})
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
import { NodeHttp2Handler } from "@smithy/node-http-handler";
|
|
3
3
|
function createHttpHandler() {
|
|
4
4
|
return new NodeHttp2Handler({
|
|
5
|
-
requestTimeout:
|
|
6
|
-
|
|
5
|
+
requestTimeout: 20 * 60 * 1e3,
|
|
6
|
+
// 20 minutes
|
|
7
|
+
sessionTimeout: 30 * 60 * 1e3
|
|
8
|
+
// 30 minutes
|
|
7
9
|
});
|
|
8
10
|
}
|
|
9
11
|
|
|
@@ -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.
|
|
10
|
+
version: "0.71.18",
|
|
11
11
|
description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
12
12
|
repository: {
|
|
13
13
|
type: "github",
|
|
@@ -136,9 +136,9 @@ var require_package = __commonJS({
|
|
|
136
136
|
"@nx/js": "catalog:",
|
|
137
137
|
"@nx/node": "catalog:",
|
|
138
138
|
"@nx/web": "catalog:",
|
|
139
|
-
"@storm-software/config": "1.134.
|
|
140
|
-
"@storm-software/config-tools": "1.188.
|
|
141
|
-
"@storm-software/workspace-tools": "1.294.
|
|
139
|
+
"@storm-software/config": "1.134.67",
|
|
140
|
+
"@storm-software/config-tools": "1.188.67",
|
|
141
|
+
"@storm-software/workspace-tools": "1.294.11",
|
|
142
142
|
nx: "catalog:",
|
|
143
143
|
tsup: "catalog:",
|
|
144
144
|
wrangler: ">=3.58.0"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
createHttpHandler
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-PFHLUKVX.mjs";
|
|
4
4
|
import {
|
|
5
5
|
getInternalDependencies,
|
|
6
6
|
uploadFile
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
import {
|
|
13
13
|
findWorkspaceRoot,
|
|
14
14
|
getConfig
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-G4ZCI2MN.mjs";
|
|
16
16
|
import {
|
|
17
17
|
correctPaths,
|
|
18
18
|
joinPaths,
|
package/dist/executors.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";require('./chunk-XO66D74Z.js');
|
|
2
|
-
require('./chunk-
|
|
3
|
-
require('./chunk-
|
|
2
|
+
require('./chunk-2Q2XFRC4.js');
|
|
3
|
+
require('./chunk-25Q25WAF.js');
|
|
4
4
|
require('./chunk-2A2OE6L4.js');
|
|
5
5
|
require('./chunk-QBD2OGUY.js');
|
|
6
|
-
require('./chunk-
|
|
6
|
+
require('./chunk-IVVRVG36.js');
|
|
7
7
|
require('./chunk-N7FW365Q.js');
|
|
8
|
-
require('./chunk-
|
|
8
|
+
require('./chunk-5GILNZWS.js');
|
|
9
9
|
require('./chunk-Z2WQB55R.js');
|
|
10
10
|
require('./chunk-MCKGQKYU.js');
|
package/dist/executors.mjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import "./chunk-YSCEY447.mjs";
|
|
2
|
-
import "./chunk-
|
|
3
|
-
import "./chunk-
|
|
2
|
+
import "./chunk-WZ5BU6WQ.mjs";
|
|
3
|
+
import "./chunk-PFHLUKVX.mjs";
|
|
4
4
|
import "./chunk-M2N5CL5V.mjs";
|
|
5
5
|
import "./chunk-WFPKBGV3.mjs";
|
|
6
|
-
import "./chunk-
|
|
6
|
+
import "./chunk-NIOOY3TB.mjs";
|
|
7
7
|
import "./chunk-3MAI3FU2.mjs";
|
|
8
|
-
import "./chunk-
|
|
8
|
+
import "./chunk-G4ZCI2MN.mjs";
|
|
9
9
|
import "./chunk-TPNHSNNZ.mjs";
|
|
10
10
|
import "./chunk-PALWHFOL.mjs";
|
package/dist/generators.js
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkMVMFQZFIjs = require('./chunk-MVMFQZFI.js');
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
var
|
|
10
|
-
require('./chunk-
|
|
9
|
+
var _chunkCXYT523Mjs = require('./chunk-CXYT523M.js');
|
|
10
|
+
require('./chunk-5GILNZWS.js');
|
|
11
11
|
require('./chunk-Z2WQB55R.js');
|
|
12
12
|
require('./chunk-MCKGQKYU.js');
|
|
13
13
|
|
|
@@ -15,4 +15,4 @@ require('./chunk-MCKGQKYU.js');
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
exports.applicationGenerator =
|
|
18
|
+
exports.applicationGenerator = _chunkMVMFQZFIjs.applicationGenerator; exports.applicationSchematic = _chunkMVMFQZFIjs.applicationSchematic; exports.initGenerator = _chunkCXYT523Mjs.initGenerator; exports.initSchematic = _chunkCXYT523Mjs.initSchematic;
|
package/dist/generators.mjs
CHANGED
|
@@ -2,12 +2,12 @@ import "./chunk-3J7KBHMJ.mjs";
|
|
|
2
2
|
import {
|
|
3
3
|
applicationGenerator,
|
|
4
4
|
applicationSchematic
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-UFFSVT2P.mjs";
|
|
6
6
|
import {
|
|
7
7
|
initGenerator,
|
|
8
8
|
initSchematic
|
|
9
|
-
} from "./chunk-
|
|
10
|
-
import "./chunk-
|
|
9
|
+
} from "./chunk-UJ245ZHH.mjs";
|
|
10
|
+
import "./chunk-G4ZCI2MN.mjs";
|
|
11
11
|
import "./chunk-TPNHSNNZ.mjs";
|
|
12
12
|
import "./chunk-PALWHFOL.mjs";
|
|
13
13
|
export {
|
package/dist/index.js
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }require('./chunk-XO66D74Z.js');
|
|
2
|
-
require('./chunk-
|
|
2
|
+
require('./chunk-2Q2XFRC4.js');
|
|
3
3
|
require('./chunk-DHBG5ASJ.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkMVMFQZFIjs = require('./chunk-MVMFQZFI.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
var
|
|
12
|
-
require('./chunk-
|
|
11
|
+
var _chunkCXYT523Mjs = require('./chunk-CXYT523M.js');
|
|
12
|
+
require('./chunk-25Q25WAF.js');
|
|
13
13
|
require('./chunk-CVGPWUNP.js');
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
var _chunk2A2OE6L4js = require('./chunk-2A2OE6L4.js');
|
|
18
18
|
require('./chunk-QBD2OGUY.js');
|
|
19
|
-
require('./chunk-
|
|
19
|
+
require('./chunk-IVVRVG36.js');
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
|
|
23
23
|
var _chunkN7FW365Qjs = require('./chunk-N7FW365Q.js');
|
|
24
|
-
require('./chunk-
|
|
24
|
+
require('./chunk-5GILNZWS.js');
|
|
25
25
|
require('./chunk-Z2WQB55R.js');
|
|
26
26
|
require('./chunk-MCKGQKYU.js');
|
|
27
27
|
|
|
@@ -156,4 +156,4 @@ function createPackageJson(projectJsonPath, workspaceRoot) {
|
|
|
156
156
|
|
|
157
157
|
|
|
158
158
|
|
|
159
|
-
exports.applicationGenerator =
|
|
159
|
+
exports.applicationGenerator = _chunkMVMFQZFIjs.applicationGenerator; exports.applicationSchematic = _chunkMVMFQZFIjs.applicationSchematic; exports.createNodesV2 = createNodesV2; exports.getInternalDependencies = _chunk2A2OE6L4js.getInternalDependencies; exports.initGenerator = _chunkCXYT523Mjs.initGenerator; exports.initSchematic = _chunkCXYT523Mjs.initSchematic; exports.name = name; exports.uploadFile = _chunk2A2OE6L4js.uploadFile;
|
package/dist/index.mjs
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
import "./chunk-YSCEY447.mjs";
|
|
2
|
-
import "./chunk-
|
|
2
|
+
import "./chunk-WZ5BU6WQ.mjs";
|
|
3
3
|
import "./chunk-3J7KBHMJ.mjs";
|
|
4
4
|
import {
|
|
5
5
|
applicationGenerator,
|
|
6
6
|
applicationSchematic
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-UFFSVT2P.mjs";
|
|
8
8
|
import {
|
|
9
9
|
initGenerator,
|
|
10
10
|
initSchematic
|
|
11
|
-
} from "./chunk-
|
|
12
|
-
import "./chunk-
|
|
11
|
+
} from "./chunk-UJ245ZHH.mjs";
|
|
12
|
+
import "./chunk-PFHLUKVX.mjs";
|
|
13
13
|
import "./chunk-7Z5PILRU.mjs";
|
|
14
14
|
import {
|
|
15
15
|
getInternalDependencies,
|
|
16
16
|
uploadFile
|
|
17
17
|
} from "./chunk-M2N5CL5V.mjs";
|
|
18
18
|
import "./chunk-WFPKBGV3.mjs";
|
|
19
|
-
import "./chunk-
|
|
19
|
+
import "./chunk-NIOOY3TB.mjs";
|
|
20
20
|
import {
|
|
21
21
|
ProjectTagConstants,
|
|
22
22
|
addProjectTag
|
|
23
23
|
} from "./chunk-3MAI3FU2.mjs";
|
|
24
|
-
import "./chunk-
|
|
24
|
+
import "./chunk-G4ZCI2MN.mjs";
|
|
25
25
|
import "./chunk-TPNHSNNZ.mjs";
|
|
26
26
|
import "./chunk-PALWHFOL.mjs";
|
|
27
27
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
3
|
var _chunkQBD2OGUYjs = require('../../../chunk-QBD2OGUY.js');
|
|
4
|
-
require('../../../chunk-
|
|
4
|
+
require('../../../chunk-IVVRVG36.js');
|
|
5
5
|
require('../../../chunk-N7FW365Q.js');
|
|
6
|
-
require('../../../chunk-
|
|
6
|
+
require('../../../chunk-5GILNZWS.js');
|
|
7
7
|
require('../../../chunk-Z2WQB55R.js');
|
|
8
8
|
require('../../../chunk-MCKGQKYU.js');
|
|
9
9
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import {
|
|
2
2
|
runExecutor
|
|
3
3
|
} from "../../../chunk-WFPKBGV3.mjs";
|
|
4
|
-
import "../../../chunk-
|
|
4
|
+
import "../../../chunk-NIOOY3TB.mjs";
|
|
5
5
|
import "../../../chunk-3MAI3FU2.mjs";
|
|
6
|
-
import "../../../chunk-
|
|
6
|
+
import "../../../chunk-G4ZCI2MN.mjs";
|
|
7
7
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
8
8
|
import "../../../chunk-PALWHFOL.mjs";
|
|
9
9
|
export {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
|
-
var
|
|
4
|
-
require('../../../chunk-
|
|
3
|
+
var _chunk2Q2XFRC4js = require('../../../chunk-2Q2XFRC4.js');
|
|
4
|
+
require('../../../chunk-25Q25WAF.js');
|
|
5
5
|
require('../../../chunk-2A2OE6L4.js');
|
|
6
6
|
require('../../../chunk-N7FW365Q.js');
|
|
7
|
-
require('../../../chunk-
|
|
7
|
+
require('../../../chunk-5GILNZWS.js');
|
|
8
8
|
require('../../../chunk-Z2WQB55R.js');
|
|
9
9
|
require('../../../chunk-MCKGQKYU.js');
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
exports.default =
|
|
12
|
+
exports.default = _chunk2Q2XFRC4js.runExecutor;
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
runExecutor
|
|
3
|
-
} from "../../../chunk-
|
|
4
|
-
import "../../../chunk-
|
|
3
|
+
} from "../../../chunk-WZ5BU6WQ.mjs";
|
|
4
|
+
import "../../../chunk-PFHLUKVX.mjs";
|
|
5
5
|
import "../../../chunk-M2N5CL5V.mjs";
|
|
6
6
|
import "../../../chunk-3MAI3FU2.mjs";
|
|
7
|
-
import "../../../chunk-
|
|
7
|
+
import "../../../chunk-G4ZCI2MN.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
9
9
|
import "../../../chunk-PALWHFOL.mjs";
|
|
10
10
|
export {
|
|
@@ -1,10 +1,10 @@
|
|
|
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
|
|
3
|
+
var _chunkIVVRVG36js = require('../../../chunk-IVVRVG36.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
var _chunkN7FW365Qjs = require('../../../chunk-N7FW365Q.js');
|
|
7
|
-
require('../../../chunk-
|
|
7
|
+
require('../../../chunk-5GILNZWS.js');
|
|
8
8
|
require('../../../chunk-Z2WQB55R.js');
|
|
9
9
|
|
|
10
10
|
|
|
@@ -55,7 +55,7 @@ async function* serveExecutor(options, context) {
|
|
|
55
55
|
success: true
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
|
-
var executor_default =
|
|
58
|
+
var executor_default = _chunkIVVRVG36js.withRunExecutor.call(void 0,
|
|
59
59
|
"Cloudflare Serve executor",
|
|
60
60
|
serveExecutor,
|
|
61
61
|
{
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
withRunExecutor
|
|
3
|
-
} from "../../../chunk-
|
|
3
|
+
} from "../../../chunk-NIOOY3TB.mjs";
|
|
4
4
|
import {
|
|
5
5
|
createCliOptions
|
|
6
6
|
} from "../../../chunk-3MAI3FU2.mjs";
|
|
7
|
-
import "../../../chunk-
|
|
7
|
+
import "../../../chunk-G4ZCI2MN.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
9
9
|
import {
|
|
10
10
|
__require
|
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
5
|
+
var _chunkCXYT523Mjs = require('../../../chunk-CXYT523M.js');
|
|
6
6
|
require('../../../chunk-MCKGQKYU.js');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
exports.default =
|
|
11
|
+
exports.default = _chunkCXYT523Mjs.generator_default; exports.initGenerator = _chunkCXYT523Mjs.initGenerator; exports.initSchematic = _chunkCXYT523Mjs.initSchematic;
|
|
@@ -2,13 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
|
|
5
|
-
var
|
|
6
|
-
require('../../../chunk-
|
|
7
|
-
require('../../../chunk-
|
|
5
|
+
var _chunkMVMFQZFIjs = require('../../../chunk-MVMFQZFI.js');
|
|
6
|
+
require('../../../chunk-CXYT523M.js');
|
|
7
|
+
require('../../../chunk-5GILNZWS.js');
|
|
8
8
|
require('../../../chunk-Z2WQB55R.js');
|
|
9
9
|
require('../../../chunk-MCKGQKYU.js');
|
|
10
10
|
|
|
11
11
|
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
exports.applicationGenerator =
|
|
14
|
+
exports.applicationGenerator = _chunkMVMFQZFIjs.applicationGenerator; exports.applicationSchematic = _chunkMVMFQZFIjs.applicationSchematic; exports.default = _chunkMVMFQZFIjs.generator_default;
|
|
@@ -2,9 +2,9 @@ import {
|
|
|
2
2
|
applicationGenerator,
|
|
3
3
|
applicationSchematic,
|
|
4
4
|
generator_default
|
|
5
|
-
} from "../../../chunk-
|
|
6
|
-
import "../../../chunk-
|
|
7
|
-
import "../../../chunk-
|
|
5
|
+
} from "../../../chunk-UFFSVT2P.mjs";
|
|
6
|
+
import "../../../chunk-UJ245ZHH.mjs";
|
|
7
|
+
import "../../../chunk-G4ZCI2MN.mjs";
|
|
8
8
|
import "../../../chunk-TPNHSNNZ.mjs";
|
|
9
9
|
import "../../../chunk-PALWHFOL.mjs";
|
|
10
10
|
export {
|
|
@@ -3,7 +3,7 @@ import { NodeHttp2Handler } from '@smithy/node-http-handler';
|
|
|
3
3
|
/**
|
|
4
4
|
* Create a HTTP handler with a 5-minute timeout
|
|
5
5
|
*
|
|
6
|
-
* @returns A NodeHttp2Handler instance with
|
|
6
|
+
* @returns A NodeHttp2Handler instance with custom request and session timeouts
|
|
7
7
|
*/
|
|
8
8
|
declare function createHttpHandler(): NodeHttp2Handler;
|
|
9
9
|
|
|
@@ -3,7 +3,7 @@ import { NodeHttp2Handler } from '@smithy/node-http-handler';
|
|
|
3
3
|
/**
|
|
4
4
|
* Create a HTTP handler with a 5-minute timeout
|
|
5
5
|
*
|
|
6
|
-
* @returns A NodeHttp2Handler instance with
|
|
6
|
+
* @returns A NodeHttp2Handler instance with custom request and session timeouts
|
|
7
7
|
*/
|
|
8
8
|
declare function createHttpHandler(): NodeHttp2Handler;
|
|
9
9
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";Object.defineProperty(exports, "__esModule", {value: true});
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var _chunk25Q25WAFjs = require('../../chunk-25Q25WAF.js');
|
|
4
4
|
require('../../chunk-MCKGQKYU.js');
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
exports.createHttpHandler =
|
|
7
|
+
exports.createHttpHandler = _chunk25Q25WAFjs.createHttpHandler;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@storm-software/cloudflare-tools",
|
|
3
|
-
"version": "0.71.
|
|
3
|
+
"version": "0.71.19",
|
|
4
4
|
"description": "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "github",
|
|
@@ -117,9 +117,9 @@
|
|
|
117
117
|
"@nx/js": "^22.2.3",
|
|
118
118
|
"@nx/node": "^22.2.3",
|
|
119
119
|
"@nx/web": "^22.2.3",
|
|
120
|
-
"@storm-software/config": "1.134.
|
|
121
|
-
"@storm-software/config-tools": "1.188.
|
|
122
|
-
"@storm-software/workspace-tools": "1.294.
|
|
120
|
+
"@storm-software/config": "1.134.67",
|
|
121
|
+
"@storm-software/config-tools": "1.188.67",
|
|
122
|
+
"@storm-software/workspace-tools": "1.294.11",
|
|
123
123
|
"nx": "^22.2.3",
|
|
124
124
|
"tsup": "8.4.0",
|
|
125
125
|
"wrangler": ">=3.58.0"
|
|
@@ -152,5 +152,5 @@
|
|
|
152
152
|
"publishConfig": { "access": "public" },
|
|
153
153
|
"executors": "./executors.json",
|
|
154
154
|
"generators": "./generators.json",
|
|
155
|
-
"gitHead": "
|
|
155
|
+
"gitHead": "f438f1ae940bfb8925e62029b991f204694b8f70"
|
|
156
156
|
}
|