@storm-software/cloudflare-tools 0.64.1 → 0.65.1
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 +25 -0
- package/README.md +1 -2
- package/dist/{chunk-2KXKCULW.mjs → chunk-3IFILPTF.mjs} +2 -2
- package/dist/{chunk-LJBM3BJ3.mjs → chunk-DKHOMIBZ.mjs} +552 -249
- package/dist/{chunk-FULKT5FT.js → chunk-E2QSZ73F.js} +52 -50
- package/dist/{chunk-A5TC3FDP.mjs → chunk-E3VNSFL3.mjs} +1 -1
- package/dist/{chunk-C5UBH7GG.mjs → chunk-EK6YU2XP.mjs} +6 -4
- package/dist/{chunk-47LTDAIV.mjs → chunk-I3R2ATMM.mjs} +1 -1
- package/dist/{chunk-SGAIFAWB.js → chunk-NCSFOX7D.js} +5 -5
- package/dist/{chunk-SVTQEPKS.js → chunk-NKNEW5NA.js} +1 -1
- package/dist/{chunk-R6LCC4LT.js → chunk-SDOOTJSD.js} +3 -3
- package/dist/{chunk-MHMPOWJN.js → chunk-ZDZ43AAA.js} +552 -249
- package/dist/executors.js +3 -3
- package/dist/executors.mjs +3 -3
- package/dist/generators.js +4 -4
- package/dist/generators.mjs +3 -3
- package/dist/index.js +6 -6
- package/dist/index.mjs +5 -5
- 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 +3 -3
- package/dist/src/executors/r2-upload-publish/executor.mjs +2 -2
- 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/package.json +2 -2
|
@@ -8,7 +8,8 @@ var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
|
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
|
|
12
|
+
var _chunkZDZ43AAAjs = require('./chunk-ZDZ43AAA.js');
|
|
12
13
|
|
|
13
14
|
|
|
14
15
|
|
|
@@ -59,7 +60,7 @@ var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
|
59
60
|
if (result.includes("{workspaceRoot}")) {
|
|
60
61
|
result = result.replaceAll(
|
|
61
62
|
"{workspaceRoot}",
|
|
62
|
-
_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]))), () => ( _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, )))
|
|
63
64
|
);
|
|
64
65
|
}
|
|
65
66
|
return result;
|
|
@@ -108,7 +109,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
108
109
|
"The Build process failed because the context is not valid. Please run this command from a workspace."
|
|
109
110
|
);
|
|
110
111
|
}
|
|
111
|
-
const workspaceRoot3 =
|
|
112
|
+
const workspaceRoot3 = _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, );
|
|
112
113
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root || workspaceRoot3;
|
|
113
114
|
const sourceRoot = context.projectsConfigurations.projects[context.projectName].sourceRoot || projectRoot || workspaceRoot3;
|
|
114
115
|
const projectName = context.projectName;
|
|
@@ -124,7 +125,7 @@ var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_option
|
|
|
124
125
|
`,
|
|
125
126
|
config
|
|
126
127
|
);
|
|
127
|
-
config = await
|
|
128
|
+
config = await _chunkZDZ43AAAjs.getConfig.call(void 0, workspaceRoot3);
|
|
128
129
|
}
|
|
129
130
|
if (_optionalChain([executorOptions, 'optionalAccess', _7 => _7.hooks, 'optionalAccess', _8 => _8.applyDefaultOptions])) {
|
|
130
131
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -509,7 +510,7 @@ var copyAssets = async (config, assets, outputPath, projectRoot, sourceRoot, gen
|
|
|
509
510
|
}
|
|
510
511
|
_chunk2CDSXWFAjs.writeTrace.call(void 0,
|
|
511
512
|
`\u{1F4DD} Copying the following assets to the output directory:
|
|
512
|
-
${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${pendingAsset} -> ${outputPath}` : ` - ${pendingAsset.input}/${pendingAsset.glob} -> ${
|
|
513
|
+
${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${pendingAsset} -> ${outputPath}` : ` - ${pendingAsset.input}/${pendingAsset.glob} -> ${_chunkZDZ43AAAjs.joinPaths.call(void 0, outputPath, pendingAsset.output)}`).join("\n")}`,
|
|
513
514
|
config
|
|
514
515
|
);
|
|
515
516
|
const assetHandler = new (0, _copyassetshandler.CopyAssetsHandler)({
|
|
@@ -522,17 +523,17 @@ ${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${p
|
|
|
522
523
|
_chunk2CDSXWFAjs.writeTrace.call(void 0, "Completed copying assets to the output directory", config);
|
|
523
524
|
if (includeSrc === true) {
|
|
524
525
|
_chunk2CDSXWFAjs.writeDebug.call(void 0,
|
|
525
|
-
`\u{1F4DD} Adding banner and writing source files: ${
|
|
526
|
+
`\u{1F4DD} Adding banner and writing source files: ${_chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
526
527
|
outputPath,
|
|
527
528
|
"src"
|
|
528
529
|
)}`,
|
|
529
530
|
config
|
|
530
531
|
);
|
|
531
532
|
const files = await _glob.glob.call(void 0, [
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
533
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.ts"),
|
|
534
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.tsx"),
|
|
535
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.js"),
|
|
536
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, config.workspaceRoot, outputPath, "src/**/*.jsx")
|
|
536
537
|
]);
|
|
537
538
|
await Promise.allSettled(
|
|
538
539
|
files.map(
|
|
@@ -587,7 +588,7 @@ var addPackageDependencies = async (workspaceRoot3, projectRoot, projectName, pa
|
|
|
587
588
|
)) {
|
|
588
589
|
const projectNode = project.node;
|
|
589
590
|
if (projectNode.data.root) {
|
|
590
|
-
const projectPackageJsonPath =
|
|
591
|
+
const projectPackageJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
591
592
|
workspaceRoot3,
|
|
592
593
|
projectNode.data.root,
|
|
593
594
|
"package.json"
|
|
@@ -609,7 +610,7 @@ var addPackageDependencies = async (workspaceRoot3, projectRoot, projectName, pa
|
|
|
609
610
|
`\u{1F4E6} Adding local packages to package.json: ${localPackages.map((p) => p.name).join(", ")}`
|
|
610
611
|
);
|
|
611
612
|
const projectJsonFile = await _promises.readFile.call(void 0,
|
|
612
|
-
|
|
613
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, projectRoot, "project.json"),
|
|
613
614
|
"utf8"
|
|
614
615
|
);
|
|
615
616
|
const projectJson = JSON.parse(projectJsonFile);
|
|
@@ -622,7 +623,7 @@ var addPackageDependencies = async (workspaceRoot3, projectRoot, projectName, pa
|
|
|
622
623
|
}
|
|
623
624
|
const implicitDependencies = _optionalChain([projectConfigurations, 'access', _37 => _37.projects, 'optionalAccess', _38 => _38[projectName2], 'access', _39 => _39.implicitDependencies, 'optionalAccess', _40 => _40.reduce, 'call', _41 => _41((ret, dep) => {
|
|
624
625
|
if (_optionalChain([projectConfigurations, 'access', _42 => _42.projects, 'optionalAccess', _43 => _43[dep]])) {
|
|
625
|
-
const depPackageJsonPath =
|
|
626
|
+
const depPackageJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
626
627
|
workspaceRoot3,
|
|
627
628
|
projectConfigurations.projects[dep].root,
|
|
628
629
|
"package.json"
|
|
@@ -658,9 +659,9 @@ var addPackageDependencies = async (workspaceRoot3, projectRoot, projectName, pa
|
|
|
658
659
|
return packageJson;
|
|
659
660
|
};
|
|
660
661
|
var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceRoot, projectName, includeSrc = false, packageJson) => {
|
|
661
|
-
const workspaceRoot3 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot :
|
|
662
|
+
const workspaceRoot3 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot : _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, );
|
|
662
663
|
const workspacePackageJsonContent = await _promises.readFile.call(void 0,
|
|
663
|
-
|
|
664
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, workspaceRoot3, "package.json"),
|
|
664
665
|
"utf8"
|
|
665
666
|
);
|
|
666
667
|
const workspacePackageJson = JSON.parse(workspacePackageJsonContent);
|
|
@@ -671,7 +672,7 @@ var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceR
|
|
|
671
672
|
if (distSrc.startsWith("/")) {
|
|
672
673
|
distSrc = distSrc.substring(1);
|
|
673
674
|
}
|
|
674
|
-
packageJson.source ??= `${
|
|
675
|
+
packageJson.source ??= `${_chunkZDZ43AAAjs.joinPaths.call(void 0, distSrc, "index.ts").replaceAll("\\", "/")}`;
|
|
675
676
|
}
|
|
676
677
|
packageJson.files ??= ["dist/**/*"];
|
|
677
678
|
if (includeSrc === true && !packageJson.files.includes("src")) {
|
|
@@ -696,7 +697,7 @@ var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceR
|
|
|
696
697
|
packageJson.contributors = [packageJson.author];
|
|
697
698
|
}
|
|
698
699
|
packageJson.repository ??= workspacePackageJson.repository;
|
|
699
|
-
packageJson.repository.directory ??= projectRoot ? projectRoot :
|
|
700
|
+
packageJson.repository.directory ??= projectRoot ? projectRoot : _chunkZDZ43AAAjs.joinPaths.call(void 0, "packages", projectName);
|
|
700
701
|
return packageJson;
|
|
701
702
|
};
|
|
702
703
|
|
|
@@ -815,7 +816,7 @@ async function resolveContext(userOptions) {
|
|
|
815
816
|
if (!workspaceRoot3) {
|
|
816
817
|
throw new Error("Cannot find Nx workspace root");
|
|
817
818
|
}
|
|
818
|
-
const workspaceConfig = await
|
|
819
|
+
const workspaceConfig = await _chunkZDZ43AAAjs.getWorkspaceConfig.call(void 0, true, {
|
|
819
820
|
workspaceRoot: workspaceRoot3.dir
|
|
820
821
|
});
|
|
821
822
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
@@ -823,7 +824,7 @@ async function resolveContext(userOptions) {
|
|
|
823
824
|
const projectGraph = await _devkit.createProjectGraphAsync.call(void 0, {
|
|
824
825
|
exitOnError: true
|
|
825
826
|
});
|
|
826
|
-
const projectJsonPath =
|
|
827
|
+
const projectJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
827
828
|
workspaceRoot3.dir,
|
|
828
829
|
projectRoot,
|
|
829
830
|
"project.json"
|
|
@@ -842,7 +843,7 @@ async function resolveContext(userOptions) {
|
|
|
842
843
|
}
|
|
843
844
|
const options = _defu2.default.call(void 0, userOptions, DEFAULT_BUILD_OPTIONS);
|
|
844
845
|
options.name ??= projectName;
|
|
845
|
-
const packageJsonPath =
|
|
846
|
+
const packageJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
846
847
|
workspaceRoot3.dir,
|
|
847
848
|
options.projectRoot,
|
|
848
849
|
"package.json"
|
|
@@ -854,7 +855,7 @@ async function resolveContext(userOptions) {
|
|
|
854
855
|
const define = _defu2.default.call(void 0, _nullishCoalesce(options.define, () => ( {})), _nullishCoalesce(env, () => ( {})));
|
|
855
856
|
const resolvedOptions = {
|
|
856
857
|
...options,
|
|
857
|
-
tsconfig: userOptions.tsconfig === null ? void 0 : userOptions.tsconfig ? userOptions.tsconfig :
|
|
858
|
+
tsconfig: userOptions.tsconfig === null ? void 0 : userOptions.tsconfig ? userOptions.tsconfig : _chunkZDZ43AAAjs.joinPaths.call(void 0, workspaceRoot3.dir, projectRoot, "tsconfig.json"),
|
|
858
859
|
metafile: userOptions.mode === "development",
|
|
859
860
|
clean: false,
|
|
860
861
|
env,
|
|
@@ -879,8 +880,8 @@ async function resolveContext(userOptions) {
|
|
|
879
880
|
projectConfigurations,
|
|
880
881
|
projectName,
|
|
881
882
|
projectGraph,
|
|
882
|
-
sourceRoot: resolvedOptions.sourceRoot || projectJson.sourceRoot ||
|
|
883
|
-
outputPath: resolvedOptions.outputPath ||
|
|
883
|
+
sourceRoot: resolvedOptions.sourceRoot || projectJson.sourceRoot || _chunkZDZ43AAAjs.joinPaths.call(void 0, resolvedOptions.projectRoot, "src"),
|
|
884
|
+
outputPath: resolvedOptions.outputPath || _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
884
885
|
workspaceConfig.workspaceRoot,
|
|
885
886
|
"dist",
|
|
886
887
|
resolvedOptions.projectRoot
|
|
@@ -904,10 +905,10 @@ ${_chunk2CDSXWFAjs.formatLogMessage.call(void 0, context.options)}`,
|
|
|
904
905
|
|
|
905
906
|
|
|
906
907
|
async function generatePackageJson(context) {
|
|
907
|
-
if (context.options.generatePackageJson !== false && _fs.existsSync.call(void 0,
|
|
908
|
+
if (context.options.generatePackageJson !== false && _fs.existsSync.call(void 0, _chunkZDZ43AAAjs.joinPaths.call(void 0, context.options.projectRoot, "package.json"))) {
|
|
908
909
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, " \u270D\uFE0F Writing package.json file", context.workspaceConfig);
|
|
909
910
|
const stopwatch = _chunk2CDSXWFAjs.getStopwatch.call(void 0, "Write package.json file");
|
|
910
|
-
const packageJsonPath =
|
|
911
|
+
const packageJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
911
912
|
context.options.projectRoot,
|
|
912
913
|
"project.json"
|
|
913
914
|
);
|
|
@@ -915,7 +916,7 @@ async function generatePackageJson(context) {
|
|
|
915
916
|
throw new Error("Cannot find package.json configuration");
|
|
916
917
|
}
|
|
917
918
|
const packageJsonFile = await _promises2.default.readFile(
|
|
918
|
-
|
|
919
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
919
920
|
context.workspaceConfig.workspaceRoot,
|
|
920
921
|
context.options.projectRoot,
|
|
921
922
|
"package.json"
|
|
@@ -1021,7 +1022,7 @@ async function generatePackageJson(context) {
|
|
|
1021
1022
|
}
|
|
1022
1023
|
}
|
|
1023
1024
|
await _devkit.writeJsonFile.call(void 0,
|
|
1024
|
-
|
|
1025
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, context.outputPath, "package.json"),
|
|
1025
1026
|
packageJson
|
|
1026
1027
|
);
|
|
1027
1028
|
stopwatch();
|
|
@@ -1121,7 +1122,7 @@ async function executeTsup(context) {
|
|
|
1121
1122
|
const stopwatch = _chunk2CDSXWFAjs.getStopwatch.call(void 0, `${context.options.name} build`);
|
|
1122
1123
|
await _tsup.build.call(void 0, {
|
|
1123
1124
|
...context.options,
|
|
1124
|
-
outDir: context.options.distDir ?
|
|
1125
|
+
outDir: context.options.distDir ? _chunkZDZ43AAAjs.joinPaths.call(void 0, context.outputPath, context.options.distDir) : context.outputPath,
|
|
1125
1126
|
workspaceConfig: context.workspaceConfig
|
|
1126
1127
|
});
|
|
1127
1128
|
stopwatch();
|
|
@@ -1372,7 +1373,7 @@ async function unbuildExecutorFn(options, context, config) {
|
|
|
1372
1373
|
);
|
|
1373
1374
|
}
|
|
1374
1375
|
const jiti = _jiti.createJiti.call(void 0, config.workspaceRoot, {
|
|
1375
|
-
fsCache: config.skipCache ? false :
|
|
1376
|
+
fsCache: config.skipCache ? false : _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
1376
1377
|
config.workspaceRoot,
|
|
1377
1378
|
config.directories.cache || "node_modules/.cache/storm",
|
|
1378
1379
|
"jiti"
|
|
@@ -1394,7 +1395,7 @@ async function unbuildExecutorFn(options, context, config) {
|
|
|
1394
1395
|
{
|
|
1395
1396
|
stubOptions: {
|
|
1396
1397
|
jiti: {
|
|
1397
|
-
fsCache: config.skipCache ? false :
|
|
1398
|
+
fsCache: config.skipCache ? false : _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
1398
1399
|
config.workspaceRoot,
|
|
1399
1400
|
config.directories.cache || "node_modules/.cache/storm",
|
|
1400
1401
|
"jiti"
|
|
@@ -1461,14 +1462,14 @@ var withRunGenerator = (name, generatorFn, generatorOptions = {
|
|
|
1461
1462
|
_chunk2CDSXWFAjs.writeInfo.call(void 0, `\u26A1 Running the ${name} generator...
|
|
1462
1463
|
|
|
1463
1464
|
`, config);
|
|
1464
|
-
const workspaceRoot3 =
|
|
1465
|
+
const workspaceRoot3 = _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, );
|
|
1465
1466
|
if (!generatorOptions.skipReadingConfig) {
|
|
1466
1467
|
_chunk2CDSXWFAjs.writeDebug.call(void 0,
|
|
1467
1468
|
`Loading the Storm Config from environment variables and storm.config.js file...
|
|
1468
1469
|
- workspaceRoot: ${workspaceRoot3}`,
|
|
1469
1470
|
config
|
|
1470
1471
|
);
|
|
1471
|
-
config = await
|
|
1472
|
+
config = await _chunkZDZ43AAAjs.getConfig.call(void 0, workspaceRoot3);
|
|
1472
1473
|
}
|
|
1473
1474
|
if (_optionalChain([generatorOptions, 'optionalAccess', _95 => _95.hooks, 'optionalAccess', _96 => _96.applyDefaultOptions])) {
|
|
1474
1475
|
_chunk2CDSXWFAjs.writeDebug.call(void 0, "Running the applyDefaultOptions hook...", config);
|
|
@@ -1587,16 +1588,16 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1587
1588
|
const projectConfig = {
|
|
1588
1589
|
root: normalized.directory,
|
|
1589
1590
|
projectType: "library",
|
|
1590
|
-
sourceRoot:
|
|
1591
|
+
sourceRoot: _chunkZDZ43AAAjs.joinPaths.call(void 0, _nullishCoalesce(normalized.directory, () => ( "")), "src"),
|
|
1591
1592
|
targets: {
|
|
1592
1593
|
build: {
|
|
1593
1594
|
executor: options.buildExecutor,
|
|
1594
1595
|
outputs: ["{options.outputPath}"],
|
|
1595
1596
|
options: {
|
|
1596
|
-
entry: [
|
|
1597
|
+
entry: [_chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "src", "index.ts")],
|
|
1597
1598
|
outputPath: getOutputPath(normalized),
|
|
1598
|
-
tsconfig:
|
|
1599
|
-
project:
|
|
1599
|
+
tsconfig: _chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json"),
|
|
1600
|
+
project: _chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "package.json"),
|
|
1600
1601
|
defaultConfiguration: "production",
|
|
1601
1602
|
platform: "neutral",
|
|
1602
1603
|
assets: [
|
|
@@ -1653,7 +1654,7 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1653
1654
|
if (!normalized.importPath) {
|
|
1654
1655
|
normalized.importPath = normalized.name;
|
|
1655
1656
|
}
|
|
1656
|
-
const packageJsonPath =
|
|
1657
|
+
const packageJsonPath = _chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "package.json");
|
|
1657
1658
|
if (tree.exists(packageJsonPath)) {
|
|
1658
1659
|
_devkit.updateJson.call(void 0, tree, packageJsonPath, (json) => {
|
|
1659
1660
|
if (!normalized.importPath) {
|
|
@@ -1710,14 +1711,14 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1710
1711
|
}));
|
|
1711
1712
|
}
|
|
1712
1713
|
_js.addTsConfigPath.call(void 0, tree, normalized.importPath, [
|
|
1713
|
-
|
|
1714
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
1714
1715
|
normalized.projectRoot,
|
|
1715
1716
|
"./src",
|
|
1716
1717
|
`index.${normalized.js ? "js" : "ts"}`
|
|
1717
1718
|
)
|
|
1718
1719
|
]);
|
|
1719
|
-
_js.addTsConfigPath.call(void 0, tree,
|
|
1720
|
-
|
|
1720
|
+
_js.addTsConfigPath.call(void 0, tree, _chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.importPath, "/*"), [
|
|
1721
|
+
_chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "./src", "/*")
|
|
1721
1722
|
]);
|
|
1722
1723
|
if (tree.exists("package.json")) {
|
|
1723
1724
|
const packageJson = _devkit.readJson.call(void 0, tree, "package.json");
|
|
@@ -1728,7 +1729,7 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1728
1729
|
description = packageJson.description;
|
|
1729
1730
|
}
|
|
1730
1731
|
}
|
|
1731
|
-
const tsconfigPath =
|
|
1732
|
+
const tsconfigPath = _chunkZDZ43AAAjs.joinPaths.call(void 0, normalized.projectRoot, "tsconfig.json");
|
|
1732
1733
|
if (tree.exists(tsconfigPath)) {
|
|
1733
1734
|
_devkit.updateJson.call(void 0, tree, tsconfigPath, (json) => {
|
|
1734
1735
|
json.composite ??= true;
|
|
@@ -1756,7 +1757,7 @@ function getOutputPath(options) {
|
|
|
1756
1757
|
} else {
|
|
1757
1758
|
parts.push(options.projectRoot);
|
|
1758
1759
|
}
|
|
1759
|
-
return
|
|
1760
|
+
return _chunkZDZ43AAAjs.joinPaths.call(void 0, ...parts);
|
|
1760
1761
|
}
|
|
1761
1762
|
function createProjectTsConfigJson(tree, options) {
|
|
1762
1763
|
const tsconfig = {
|
|
@@ -1764,7 +1765,7 @@ function createProjectTsConfigJson(tree, options) {
|
|
|
1764
1765
|
..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _124 => _124.tsconfigOptions]), () => ( {})),
|
|
1765
1766
|
compilerOptions: {
|
|
1766
1767
|
...options.rootProject ? _js.tsConfigBaseOptions : {},
|
|
1767
|
-
outDir:
|
|
1768
|
+
outDir: _chunkZDZ43AAAjs.joinPaths.call(void 0, _devkit.offsetFromRoot.call(void 0, options.projectRoot), "dist/out-tsc"),
|
|
1768
1769
|
noEmit: true,
|
|
1769
1770
|
..._nullishCoalesce(_optionalChain([options, 'optionalAccess', _125 => _125.tsconfigOptions, 'optionalAccess', _126 => _126.compilerOptions]), () => ( {}))
|
|
1770
1771
|
},
|
|
@@ -1782,7 +1783,7 @@ function createProjectTsConfigJson(tree, options) {
|
|
|
1782
1783
|
"src/**/*.test.ts"
|
|
1783
1784
|
]
|
|
1784
1785
|
};
|
|
1785
|
-
_devkit.writeJson.call(void 0, tree,
|
|
1786
|
+
_devkit.writeJson.call(void 0, tree, _chunkZDZ43AAAjs.joinPaths.call(void 0, options.projectRoot, "tsconfig.json"), tsconfig);
|
|
1786
1787
|
}
|
|
1787
1788
|
async function normalizeOptions(tree, options, config) {
|
|
1788
1789
|
let importPath = options.importPath;
|
|
@@ -1847,7 +1848,7 @@ async function normalizeOptions(tree, options, config) {
|
|
|
1847
1848
|
|
|
1848
1849
|
// ../workspace-tools/src/generators/browser-library/generator.ts
|
|
1849
1850
|
async function browserLibraryGeneratorFn(tree, schema, config) {
|
|
1850
|
-
const filesDir =
|
|
1851
|
+
const filesDir = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
1851
1852
|
__dirname,
|
|
1852
1853
|
"src",
|
|
1853
1854
|
"generators",
|
|
@@ -1938,8 +1939,9 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
1938
1939
|
`Determining the Storm Workspace Configuration JSON Schema...`,
|
|
1939
1940
|
config
|
|
1940
1941
|
);
|
|
1941
|
-
const jsonSchema = z.toJSONSchema(
|
|
1942
|
-
target: "draft-7"
|
|
1942
|
+
const jsonSchema = z.toJSONSchema(_chunkZDZ43AAAjs.workspaceConfigSchema, {
|
|
1943
|
+
target: "draft-7",
|
|
1944
|
+
metadata: _chunkZDZ43AAAjs.schemaRegistry
|
|
1943
1945
|
});
|
|
1944
1946
|
jsonSchema.$id ??= "https://public.storm-cdn.com/schemas/storm-workspace.schema.json";
|
|
1945
1947
|
jsonSchema.title ??= "Storm Workspace Configuration JSON Schema";
|
|
@@ -1951,7 +1953,7 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
1951
1953
|
);
|
|
1952
1954
|
}
|
|
1953
1955
|
const outputPath = options.outputFile.replaceAll("{workspaceRoot}", "").replaceAll(
|
|
1954
|
-
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _135 => _135.workspaceRoot]), () => (
|
|
1956
|
+
_nullishCoalesce(_optionalChain([config, 'optionalAccess', _135 => _135.workspaceRoot]), () => ( _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, ))),
|
|
1955
1957
|
options.outputFile.startsWith("./") ? "" : "./"
|
|
1956
1958
|
);
|
|
1957
1959
|
_chunk2CDSXWFAjs.writeTrace.call(void 0,
|
|
@@ -1995,7 +1997,7 @@ var generator_default2 = withRunGenerator(
|
|
|
1995
1997
|
|
|
1996
1998
|
|
|
1997
1999
|
async function neutralLibraryGeneratorFn(tree, schema, config) {
|
|
1998
|
-
const filesDir =
|
|
2000
|
+
const filesDir = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
1999
2001
|
__dirname,
|
|
2000
2002
|
"src",
|
|
2001
2003
|
"generators",
|
|
@@ -2054,7 +2056,7 @@ var generator_default3 = withRunGenerator(
|
|
|
2054
2056
|
|
|
2055
2057
|
|
|
2056
2058
|
async function nodeLibraryGeneratorFn(tree, schema, config) {
|
|
2057
|
-
const filesDir =
|
|
2059
|
+
const filesDir = _chunkZDZ43AAAjs.joinPaths.call(void 0,
|
|
2058
2060
|
__dirname,
|
|
2059
2061
|
"src",
|
|
2060
2062
|
"generators",
|
|
@@ -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.
|
|
10
|
+
version: "0.65.0",
|
|
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",
|
|
@@ -7,8 +7,9 @@ import {
|
|
|
7
7
|
getConfig,
|
|
8
8
|
getWorkspaceConfig,
|
|
9
9
|
joinPaths,
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
schemaRegistry,
|
|
11
|
+
workspaceConfigSchema
|
|
12
|
+
} from "./chunk-DKHOMIBZ.mjs";
|
|
12
13
|
import {
|
|
13
14
|
formatLogMessage,
|
|
14
15
|
getStopwatch,
|
|
@@ -1939,8 +1940,9 @@ async function configSchemaGeneratorFn(tree, options, config) {
|
|
|
1939
1940
|
`Determining the Storm Workspace Configuration JSON Schema...`,
|
|
1940
1941
|
config
|
|
1941
1942
|
);
|
|
1942
|
-
const jsonSchema = z.toJSONSchema(
|
|
1943
|
-
target: "draft-7"
|
|
1943
|
+
const jsonSchema = z.toJSONSchema(workspaceConfigSchema, {
|
|
1944
|
+
target: "draft-7",
|
|
1945
|
+
metadata: schemaRegistry
|
|
1944
1946
|
});
|
|
1945
1947
|
jsonSchema.$id ??= "https://public.storm-cdn.com/schemas/storm-workspace.schema.json";
|
|
1946
1948
|
jsonSchema.title ??= "Storm Workspace Configuration JSON Schema";
|
|
@@ -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 _chunkNKNEW5NAjs = require('./chunk-NKNEW5NA.js');
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
|
|
7
|
-
var
|
|
7
|
+
var _chunkZDZ43AAAjs = require('./chunk-ZDZ43AAA.js');
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
|
|
@@ -51,13 +51,13 @@ async function applicationGenerator(tree, schema) {
|
|
|
51
51
|
_chunk2CDSXWFAjs.writeInfo.call(void 0, `\u26A1 Running the Storm Worker generator...
|
|
52
52
|
|
|
53
53
|
`, config);
|
|
54
|
-
const workspaceRoot =
|
|
54
|
+
const workspaceRoot = _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, );
|
|
55
55
|
_chunk2CDSXWFAjs.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 _chunkZDZ43AAAjs.getConfig.call(void 0, workspaceRoot);
|
|
61
61
|
_chunk2CDSXWFAjs.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 _chunkNKNEW5NAjs.generator_default.call(void 0, tree, {
|
|
70
70
|
...options,
|
|
71
71
|
skipFormat: true
|
|
72
72
|
})
|
|
@@ -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.
|
|
10
|
+
version: "0.65.0",
|
|
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",
|
|
@@ -9,7 +9,7 @@ var _chunkNU34IEWNjs = require('./chunk-NU34IEWN.js');
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _chunkZDZ43AAAjs = require('./chunk-ZDZ43AAA.js');
|
|
13
13
|
|
|
14
14
|
|
|
15
15
|
|
|
@@ -39,8 +39,8 @@ async function runExecutor(options, context) {
|
|
|
39
39
|
throw new Error("The executor requires projectsConfigurations.");
|
|
40
40
|
}
|
|
41
41
|
try {
|
|
42
|
-
const workspaceRoot =
|
|
43
|
-
const config = await
|
|
42
|
+
const workspaceRoot = _chunkZDZ43AAAjs.findWorkspaceRoot.call(void 0, );
|
|
43
|
+
const config = await _chunkZDZ43AAAjs.getConfig.call(void 0, workspaceRoot);
|
|
44
44
|
const sourceRoot = _nullishCoalesce(_optionalChain([context, 'access', _7 => _7.projectsConfigurations, 'access', _8 => _8.projects, 'access', _9 => _9[context.projectName], 'optionalAccess', _10 => _10.sourceRoot]), () => ( workspaceRoot));
|
|
45
45
|
const projectName = _nullishCoalesce(_optionalChain([context, 'access', _11 => _11.projectsConfigurations, 'access', _12 => _12.projects, 'access', _13 => _13[context.projectName], 'optionalAccess', _14 => _14.name]), () => ( context.projectName));
|
|
46
46
|
const projectDetails = _chunkNU34IEWNjs.getPackageInfo.call(void 0,
|