@storm-software/cloudflare-tools 0.71.242 → 0.71.247
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 +60 -0
- package/README.md +1 -1
- package/dist/{chunk-GLKR5BOA.js → chunk-2SPQ64QX.js} +2 -2
- package/dist/{chunk-BGMLQBUW.mjs → chunk-BTKJRCZQ.mjs} +1 -1
- package/dist/{chunk-KNN4W7QC.mjs → chunk-GYIUU2G4.mjs} +184 -142
- package/dist/{chunk-3GUCTXXT.mjs → chunk-KZQP6DGG.mjs} +2 -2
- package/dist/{chunk-MVEHOKMY.mjs → chunk-MCCHKUCS.mjs} +2 -2
- package/dist/{chunk-YCOA7IKG.mjs → chunk-NG5JLH7K.mjs} +7 -7
- package/dist/{chunk-4HEOMMTX.mjs → chunk-NZ4SP2BO.mjs} +2 -2
- package/dist/{chunk-AF4CHUYX.js → chunk-O6QQDVZ5.js} +2 -2
- package/dist/{chunk-GRVOVEJP.js → chunk-OTUOQHGH.js} +6 -6
- package/dist/{chunk-TMHLSIZ5.js → chunk-UGIZ5QUS.js} +1 -1
- package/dist/{chunk-EI77CIK7.mjs → chunk-WPIQWFHD.mjs} +1 -1
- package/dist/{chunk-7NFFNXFN.js → chunk-XKZTXB5T.js} +163 -121
- package/dist/executors.js +1 -1
- package/dist/executors.mjs +3 -3
- package/dist/generators.js +3 -3
- package/dist/generators.mjs +3 -3
- package/dist/index.js +4 -4
- package/dist/index.mjs +5 -5
- package/dist/src/executors/cloudflare-publish/executor.js +1 -1
- package/dist/src/executors/cloudflare-publish/executor.mjs +3 -3
- package/dist/src/executors/r2-upload-publish/executor.mjs +1 -1
- package/dist/src/executors/r2-upload-publish/untyped.mjs +1 -1
- package/dist/src/executors/serve/executor.js +2 -2
- 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 +2 -2
- package/dist/src/generators/worker/generator.js +3 -3
- package/dist/src/generators/worker/generator.mjs +3 -3
- package/dist/src/plugins/index.mjs +1 -1
- package/dist/src/utils/http-handler.mjs +1 -1
- package/dist/src/utils/index.mjs +1 -1
- package/dist/src/utils/r2-bucket-helpers.mjs +1 -1
- package/package.json +10 -10
- package/dist/chunk-BASIQFOW.js +0 -231
- package/dist/chunk-E2KDBKFZ.mjs +0 -231
|
@@ -30,7 +30,7 @@ import {
|
|
|
30
30
|
} from "./chunk-K4H5ZMYA.mjs";
|
|
31
31
|
import {
|
|
32
32
|
__dirname
|
|
33
|
-
} from "./chunk-
|
|
33
|
+
} from "./chunk-WPIQWFHD.mjs";
|
|
34
34
|
|
|
35
35
|
// ../config-tools/src/utilities/apply-workspace-tokens.ts
|
|
36
36
|
var applyWorkspaceBaseTokens = async (option, tokenParams) => {
|
|
@@ -630,40 +630,21 @@ var executor_default7 = withRunExecutor(
|
|
|
630
630
|
}
|
|
631
631
|
);
|
|
632
632
|
|
|
633
|
-
// ../npm-tools/src/helpers/get-version.ts
|
|
634
|
-
import { exec as exec2 } from "node:child_process";
|
|
635
|
-
import { valid } from "semver";
|
|
636
|
-
import stripAnsi from "strip-ansi";
|
|
637
|
-
|
|
638
|
-
// ../npm-tools/src/helpers/get-registry.ts
|
|
639
|
-
import { exec } from "node:child_process";
|
|
640
|
-
|
|
641
|
-
// ../pnpm-tools/src/helpers/catalog.ts
|
|
642
|
-
import { coerce, gt, valid as valid2 } from "semver";
|
|
643
|
-
|
|
644
|
-
// ../pnpm-tools/src/helpers/pnpm-workspace.ts
|
|
645
|
-
import { existsSync } from "node:fs";
|
|
646
|
-
import { readFile, writeFile } from "node:fs/promises";
|
|
647
|
-
import { parse, stringify } from "yaml";
|
|
648
|
-
|
|
649
|
-
// ../pnpm-tools/src/helpers/replace-deps-aliases.ts
|
|
650
|
-
import {
|
|
651
|
-
createProjectGraphAsync,
|
|
652
|
-
readCachedProjectGraph
|
|
653
|
-
} from "@nx/devkit";
|
|
654
|
-
import { existsSync as existsSync2 } from "node:fs";
|
|
655
|
-
import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
|
|
656
|
-
import { format } from "prettier";
|
|
657
|
-
|
|
658
633
|
// ../workspace-tools/src/executors/npm-publish/executor.ts
|
|
659
634
|
import { createJiti as createJiti4 } from "jiti";
|
|
660
635
|
import { execSync as execSync3 } from "node:child_process";
|
|
661
|
-
import { readFile
|
|
662
|
-
import { format
|
|
636
|
+
import { readFile, writeFile } from "node:fs/promises";
|
|
637
|
+
import { format } from "prettier";
|
|
663
638
|
|
|
664
639
|
// ../workspace-tools/src/utils/github.ts
|
|
665
640
|
import { createJiti as createJiti3 } from "jiti";
|
|
666
641
|
|
|
642
|
+
// ../workspace-tools/src/utils/package-manager.ts
|
|
643
|
+
import {
|
|
644
|
+
detectPackageManager,
|
|
645
|
+
getPackageManagerCommand
|
|
646
|
+
} from "@nx/devkit";
|
|
647
|
+
|
|
667
648
|
// ../workspace-tools/src/executors/npm-publish/executor.ts
|
|
668
649
|
var LARGE_BUFFER2 = 1024 * 1e6;
|
|
669
650
|
|
|
@@ -710,7 +691,7 @@ var executor_default8 = withRunExecutor(
|
|
|
710
691
|
|
|
711
692
|
// ../tsdown/src/build.ts
|
|
712
693
|
import {
|
|
713
|
-
createProjectGraphAsync as
|
|
694
|
+
createProjectGraphAsync as createProjectGraphAsync2,
|
|
714
695
|
readProjectsConfigurationFromProjectGraph as readProjectsConfigurationFromProjectGraph2,
|
|
715
696
|
writeJsonFile
|
|
716
697
|
} from "@nx/devkit";
|
|
@@ -736,7 +717,7 @@ import { relative as relative3 } from "path";
|
|
|
736
717
|
// ../build-tools/src/utilities/copy-assets.ts
|
|
737
718
|
import { CopyAssetsHandler } from "@nx/js/internal";
|
|
738
719
|
import { glob } from "glob";
|
|
739
|
-
import { readFile as
|
|
720
|
+
import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
|
|
740
721
|
var copyAssets = async (config, assets, outputPath, projectRoot, sourceRoot, generatePackageJson2 = true, includeSrc = false, banner, footer) => {
|
|
741
722
|
const pendingAssets = Array.from(assets ?? []);
|
|
742
723
|
pendingAssets.push({
|
|
@@ -792,11 +773,11 @@ ${pendingAssets.map((pendingAsset) => typeof pendingAsset === "string" ? ` - ${p
|
|
|
792
773
|
]);
|
|
793
774
|
await Promise.allSettled(
|
|
794
775
|
files.map(
|
|
795
|
-
async (file) =>
|
|
776
|
+
async (file) => writeFile2(
|
|
796
777
|
file,
|
|
797
778
|
`${banner && typeof banner === "string" ? banner.startsWith("//") ? banner : `// ${banner}` : ""}
|
|
798
779
|
|
|
799
|
-
${await
|
|
780
|
+
${await readFile2(file, "utf8")}
|
|
800
781
|
|
|
801
782
|
${footer && typeof footer === "string" ? footer.startsWith("//") ? footer : `// ${footer}` : ""}`
|
|
802
783
|
)
|
|
@@ -808,20 +789,20 @@ ${footer && typeof footer === "string" ? footer.startsWith("//") ? footer : `//
|
|
|
808
789
|
// ../build-tools/src/utilities/generate-package-json.ts
|
|
809
790
|
import { calculateProjectBuildableDependencies } from "@nx/js/internal";
|
|
810
791
|
import { Glob } from "glob";
|
|
811
|
-
import { existsSync
|
|
812
|
-
import { readFile as
|
|
792
|
+
import { existsSync, readFileSync as readFileSync3 } from "node:fs";
|
|
793
|
+
import { readFile as readFile3 } from "node:fs/promises";
|
|
813
794
|
import {
|
|
814
|
-
createProjectGraphAsync
|
|
815
|
-
readCachedProjectGraph
|
|
795
|
+
createProjectGraphAsync,
|
|
796
|
+
readCachedProjectGraph,
|
|
816
797
|
readProjectsConfigurationFromProjectGraph
|
|
817
798
|
} from "nx/src/project-graph/project-graph";
|
|
818
799
|
var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, packageJson) => {
|
|
819
800
|
let projectGraph;
|
|
820
801
|
try {
|
|
821
|
-
projectGraph =
|
|
802
|
+
projectGraph = readCachedProjectGraph();
|
|
822
803
|
} catch {
|
|
823
|
-
await
|
|
824
|
-
projectGraph =
|
|
804
|
+
await createProjectGraphAsync();
|
|
805
|
+
projectGraph = readCachedProjectGraph();
|
|
825
806
|
}
|
|
826
807
|
if (!projectGraph) {
|
|
827
808
|
throw new Error(
|
|
@@ -848,8 +829,8 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
848
829
|
projectNode.data.root,
|
|
849
830
|
"package.json"
|
|
850
831
|
);
|
|
851
|
-
if (
|
|
852
|
-
const projectPackageJsonContent = await
|
|
832
|
+
if (existsSync(projectPackageJsonPath)) {
|
|
833
|
+
const projectPackageJsonContent = await readFile3(
|
|
853
834
|
projectPackageJsonPath,
|
|
854
835
|
"utf8"
|
|
855
836
|
);
|
|
@@ -864,7 +845,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
864
845
|
writeTrace(
|
|
865
846
|
`\u{1F4E6} Adding local packages to package.json: ${localPackages.map((p) => p.name).join(", ")}`
|
|
866
847
|
);
|
|
867
|
-
const projectJsonFile = await
|
|
848
|
+
const projectJsonFile = await readFile3(
|
|
868
849
|
joinPaths(projectRoot, "project.json"),
|
|
869
850
|
"utf8"
|
|
870
851
|
);
|
|
@@ -883,7 +864,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
883
864
|
projectConfigurations.projects[dep].root,
|
|
884
865
|
"package.json"
|
|
885
866
|
);
|
|
886
|
-
if (
|
|
867
|
+
if (existsSync(depPackageJsonPath)) {
|
|
887
868
|
const depPackageJsonContent = readFileSync3(
|
|
888
869
|
depPackageJsonPath,
|
|
889
870
|
"utf8"
|
|
@@ -915,7 +896,7 @@ var addPackageDependencies = async (workspaceRoot2, projectRoot, projectName, pa
|
|
|
915
896
|
};
|
|
916
897
|
var addWorkspacePackageJsonFields = async (workspaceConfig, projectRoot, sourceRoot, projectName, includeSrc = false, packageJson) => {
|
|
917
898
|
const workspaceRoot2 = workspaceConfig.workspaceRoot ? workspaceConfig.workspaceRoot : findWorkspaceRoot();
|
|
918
|
-
const workspacePackageJsonContent = await
|
|
899
|
+
const workspacePackageJsonContent = await readFile3(
|
|
919
900
|
joinPaths(workspaceRoot2, "package.json"),
|
|
920
901
|
"utf8"
|
|
921
902
|
);
|
|
@@ -994,8 +975,8 @@ var getEnv = (builder, options) => {
|
|
|
994
975
|
};
|
|
995
976
|
|
|
996
977
|
// ../build-tools/src/utilities/read-nx-config.ts
|
|
997
|
-
import { existsSync as
|
|
998
|
-
import { readFile as
|
|
978
|
+
import { existsSync as existsSync2 } from "node:fs";
|
|
979
|
+
import { readFile as readFile4 } from "node:fs/promises";
|
|
999
980
|
|
|
1000
981
|
// ../build-tools/src/utilities/task-graph.ts
|
|
1001
982
|
import {
|
|
@@ -1005,7 +986,7 @@ import {
|
|
|
1005
986
|
|
|
1006
987
|
// ../tsdown/src/build.ts
|
|
1007
988
|
import defu2 from "defu";
|
|
1008
|
-
import { existsSync as
|
|
989
|
+
import { existsSync as existsSync3 } from "node:fs";
|
|
1009
990
|
import hf from "node:fs/promises";
|
|
1010
991
|
import { build as tsdown } from "tsdown";
|
|
1011
992
|
|
|
@@ -1032,15 +1013,15 @@ function getDefaultOptions(config) {
|
|
|
1032
1013
|
...config
|
|
1033
1014
|
};
|
|
1034
1015
|
}
|
|
1035
|
-
function toTSDownFormat(
|
|
1036
|
-
if (!
|
|
1016
|
+
function toTSDownFormat(format2) {
|
|
1017
|
+
if (!format2 || Array.isArray(format2) && format2.length === 0) {
|
|
1037
1018
|
return ["cjs", "es"];
|
|
1038
|
-
} else if (
|
|
1019
|
+
} else if (format2 === "esm") {
|
|
1039
1020
|
return "es";
|
|
1040
|
-
} else if (Array.isArray(
|
|
1041
|
-
return
|
|
1021
|
+
} else if (Array.isArray(format2)) {
|
|
1022
|
+
return format2.map((f) => f === "esm" ? "es" : f);
|
|
1042
1023
|
}
|
|
1043
|
-
return
|
|
1024
|
+
return format2;
|
|
1044
1025
|
}
|
|
1045
1026
|
|
|
1046
1027
|
// ../tsdown/src/build.ts
|
|
@@ -1055,7 +1036,7 @@ var resolveOptions = async (userOptions) => {
|
|
|
1055
1036
|
});
|
|
1056
1037
|
writeDebug(" \u2699\uFE0F Resolving build options", workspaceConfig);
|
|
1057
1038
|
const stopwatch = getStopwatch("Build options resolution");
|
|
1058
|
-
const projectGraph = await
|
|
1039
|
+
const projectGraph = await createProjectGraphAsync2({
|
|
1059
1040
|
exitOnError: true
|
|
1060
1041
|
});
|
|
1061
1042
|
const projectJsonPath = joinPaths(
|
|
@@ -1063,7 +1044,7 @@ var resolveOptions = async (userOptions) => {
|
|
|
1063
1044
|
options.projectRoot,
|
|
1064
1045
|
"project.json"
|
|
1065
1046
|
);
|
|
1066
|
-
if (!
|
|
1047
|
+
if (!existsSync3(projectJsonPath)) {
|
|
1067
1048
|
throw new Error("Cannot find project.json configuration");
|
|
1068
1049
|
}
|
|
1069
1050
|
const projectJsonFile = await hf.readFile(projectJsonPath, "utf8");
|
|
@@ -1080,7 +1061,7 @@ var resolveOptions = async (userOptions) => {
|
|
|
1080
1061
|
options.projectRoot,
|
|
1081
1062
|
"package.json"
|
|
1082
1063
|
);
|
|
1083
|
-
if (!
|
|
1064
|
+
if (!existsSync3(packageJsonPath)) {
|
|
1084
1065
|
throw new Error("Cannot find package.json configuration");
|
|
1085
1066
|
}
|
|
1086
1067
|
const debug = options.debug ?? (options.mode || workspaceConfig.mode) === "development";
|
|
@@ -1125,11 +1106,11 @@ var resolveOptions = async (userOptions) => {
|
|
|
1125
1106
|
return result;
|
|
1126
1107
|
};
|
|
1127
1108
|
async function generatePackageJson(options) {
|
|
1128
|
-
if (options.generatePackageJson !== false &&
|
|
1109
|
+
if (options.generatePackageJson !== false && existsSync3(joinPaths(options.projectRoot, "package.json"))) {
|
|
1129
1110
|
writeDebug(" \u270D\uFE0F Writing package.json file", options.workspaceConfig);
|
|
1130
1111
|
const stopwatch = getStopwatch("Write package.json file");
|
|
1131
1112
|
const packageJsonPath = joinPaths(options.projectRoot, "project.json");
|
|
1132
|
-
if (!
|
|
1113
|
+
if (!existsSync3(packageJsonPath)) {
|
|
1133
1114
|
throw new Error("Cannot find package.json configuration");
|
|
1134
1115
|
}
|
|
1135
1116
|
const packageJsonFile = await hf.readFile(
|
|
@@ -1574,7 +1555,16 @@ import {
|
|
|
1574
1555
|
var typesNodeVersion = "20.9.0";
|
|
1575
1556
|
var nxVersion = "^18.0.4";
|
|
1576
1557
|
var nodeVersion = "20.11.0";
|
|
1577
|
-
var pnpmVersion = "
|
|
1558
|
+
var pnpmVersion = "10.3.0";
|
|
1559
|
+
var npmVersion = "10.9.0";
|
|
1560
|
+
var yarnVersion = "4.6.0";
|
|
1561
|
+
var bunVersion = "1.2.0";
|
|
1562
|
+
var packageManagerVersions = {
|
|
1563
|
+
npm: npmVersion,
|
|
1564
|
+
yarn: yarnVersion,
|
|
1565
|
+
pnpm: pnpmVersion,
|
|
1566
|
+
bun: bunVersion
|
|
1567
|
+
};
|
|
1578
1568
|
|
|
1579
1569
|
// ../workspace-tools/src/base/typescript-library-generator.ts
|
|
1580
1570
|
async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
@@ -1705,16 +1695,45 @@ async function typeScriptLibraryGeneratorFn(tree, options, config) {
|
|
|
1705
1695
|
});
|
|
1706
1696
|
}
|
|
1707
1697
|
if (tree.exists("package.json") && normalized.importPath) {
|
|
1708
|
-
updateJson(tree, "package.json", (json) =>
|
|
1709
|
-
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1698
|
+
updateJson(tree, "package.json", (json) => {
|
|
1699
|
+
if (config?.packageManager === "yarn") {
|
|
1700
|
+
return {
|
|
1701
|
+
...json,
|
|
1702
|
+
resolutions: {
|
|
1703
|
+
...json?.resolutions,
|
|
1704
|
+
[normalized.importPath ?? ""]: "workspace:*"
|
|
1705
|
+
}
|
|
1706
|
+
};
|
|
1707
|
+
}
|
|
1708
|
+
if (config?.packageManager === "npm") {
|
|
1709
|
+
return {
|
|
1710
|
+
...json,
|
|
1711
|
+
overrides: {
|
|
1712
|
+
...json?.overrides,
|
|
1713
|
+
[normalized.importPath ?? ""]: "workspace:*"
|
|
1714
|
+
}
|
|
1715
|
+
};
|
|
1716
1716
|
}
|
|
1717
|
-
|
|
1717
|
+
if (config?.packageManager === "bun") {
|
|
1718
|
+
return {
|
|
1719
|
+
...json,
|
|
1720
|
+
overrides: {
|
|
1721
|
+
...json?.overrides,
|
|
1722
|
+
[normalized.importPath ?? ""]: "workspace:*"
|
|
1723
|
+
}
|
|
1724
|
+
};
|
|
1725
|
+
}
|
|
1726
|
+
return {
|
|
1727
|
+
...json,
|
|
1728
|
+
pnpm: {
|
|
1729
|
+
...json?.pnpm,
|
|
1730
|
+
overrides: {
|
|
1731
|
+
...json?.pnpm?.overrides,
|
|
1732
|
+
[normalized.importPath ?? ""]: "workspace:*"
|
|
1733
|
+
}
|
|
1734
|
+
}
|
|
1735
|
+
};
|
|
1736
|
+
});
|
|
1718
1737
|
}
|
|
1719
1738
|
addTsConfigPath(tree, normalized.importPath, [
|
|
1720
1739
|
joinPaths(
|
|
@@ -2121,12 +2140,57 @@ import {
|
|
|
2121
2140
|
addProjectConfiguration as addProjectConfiguration2,
|
|
2122
2141
|
formatFiles as formatFiles7,
|
|
2123
2142
|
generateFiles as generateFiles4,
|
|
2143
|
+
getPackageManagerCommand as getPackageManagerCommand2,
|
|
2124
2144
|
joinPathFragments as joinPathFragments4,
|
|
2125
2145
|
updateJson as updateJson2
|
|
2126
2146
|
} from "@nx/devkit";
|
|
2127
2147
|
import * as path2 from "node:path";
|
|
2148
|
+
|
|
2149
|
+
// ../workspace-tools/src/utils/lock-file.ts
|
|
2150
|
+
import {
|
|
2151
|
+
output,
|
|
2152
|
+
readJsonFile,
|
|
2153
|
+
workspaceRoot
|
|
2154
|
+
} from "@nx/devkit";
|
|
2155
|
+
import { existsSync as existsSync4 } from "node:fs";
|
|
2156
|
+
import { join } from "node:path";
|
|
2157
|
+
import {
|
|
2158
|
+
getNpmLockfileDependencies,
|
|
2159
|
+
getNpmLockfileNodes
|
|
2160
|
+
} from "nx/src/plugins/js/lock-file/npm-parser";
|
|
2161
|
+
import {
|
|
2162
|
+
getPnpmLockfileDependencies,
|
|
2163
|
+
getPnpmLockfileNodes
|
|
2164
|
+
} from "nx/src/plugins/js/lock-file/pnpm-parser";
|
|
2165
|
+
import {
|
|
2166
|
+
getYarnLockfileDependencies,
|
|
2167
|
+
getYarnLockfileNodes
|
|
2168
|
+
} from "nx/src/plugins/js/lock-file/yarn-parser";
|
|
2169
|
+
var YARN_LOCK_FILE = "yarn.lock";
|
|
2170
|
+
var NPM_LOCK_FILE = "package-lock.json";
|
|
2171
|
+
var PNPM_LOCK_FILE = "pnpm-lock.yaml";
|
|
2172
|
+
var BUN_LOCK_FILE = "bun.lock";
|
|
2173
|
+
var YARN_LOCK_PATH = join(workspaceRoot, YARN_LOCK_FILE);
|
|
2174
|
+
var NPM_LOCK_PATH = join(workspaceRoot, NPM_LOCK_FILE);
|
|
2175
|
+
var PNPM_LOCK_PATH = join(workspaceRoot, PNPM_LOCK_FILE);
|
|
2176
|
+
var BUN_LOCK_PATH = join(workspaceRoot, BUN_LOCK_FILE);
|
|
2177
|
+
var LOCK_FILE_BY_PACKAGE_MANAGER = {
|
|
2178
|
+
npm: "package-lock.json",
|
|
2179
|
+
yarn: "yarn.lock",
|
|
2180
|
+
pnpm: "pnpm-lock.yaml",
|
|
2181
|
+
bun: "bun.lock"
|
|
2182
|
+
};
|
|
2183
|
+
function getLockFileName(packageManager) {
|
|
2184
|
+
return LOCK_FILE_BY_PACKAGE_MANAGER[packageManager];
|
|
2185
|
+
}
|
|
2186
|
+
|
|
2187
|
+
// ../workspace-tools/src/generators/preset/generator.ts
|
|
2128
2188
|
async function presetGeneratorFn(tree, options) {
|
|
2129
2189
|
const projectRoot = ".";
|
|
2190
|
+
const packageManager = options.packageManager ?? "pnpm";
|
|
2191
|
+
const packageManagerVersion = packageManagerVersions[packageManager];
|
|
2192
|
+
const pmc = getPackageManagerCommand2(packageManager);
|
|
2193
|
+
const lockFileName = getLockFileName(packageManager);
|
|
2130
2194
|
options.description ??= `\u26A1The ${options.namespace ? options.namespace : options.name} monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.`;
|
|
2131
2195
|
options.namespace ??= options.organization;
|
|
2132
2196
|
addProjectConfiguration2(tree, `@${options.namespace}/${options.name}`, {
|
|
@@ -2194,11 +2258,6 @@ async function presetGeneratorFn(tree, options) {
|
|
|
2194
2258
|
type: "github",
|
|
2195
2259
|
url: `${options.repositoryUrl}.git`
|
|
2196
2260
|
};
|
|
2197
|
-
json.packageManager ??= "pnpm@10.3.0";
|
|
2198
|
-
json.engines ??= {
|
|
2199
|
-
node: ">=20.11.0",
|
|
2200
|
-
pnpm: ">=10.3.0"
|
|
2201
|
-
};
|
|
2202
2261
|
json.prettier = "@storm-software/prettier/config.json";
|
|
2203
2262
|
json.nx ??= {
|
|
2204
2263
|
includedScripts: [
|
|
@@ -2215,14 +2274,14 @@ async function presetGeneratorFn(tree, options) {
|
|
|
2215
2274
|
"release"
|
|
2216
2275
|
]
|
|
2217
2276
|
};
|
|
2218
|
-
json.scripts.adr = "
|
|
2219
|
-
json.scripts["adr-preview"] = "
|
|
2220
|
-
json.scripts.prepare =
|
|
2221
|
-
json.scripts.preinstall =
|
|
2222
|
-
json.scripts["install-csb"] = "corepack enable &&
|
|
2277
|
+
json.scripts.adr = pmc.run("log4brains", "adr new");
|
|
2278
|
+
json.scripts["adr-preview"] = pmc.run("log4brains", "preview");
|
|
2279
|
+
json.scripts.prepare = `${pmc.addDev} lefthook && ${packageManager} lefthook install`;
|
|
2280
|
+
json.scripts.preinstall = `npx -y only-allow ${packageManager}`;
|
|
2281
|
+
json.scripts["install-csb"] = packageManager === "bun" ? "bun install" : `corepack enable && ${pmc.install}`;
|
|
2223
2282
|
json.scripts.clean = "rimraf dist && rimraf --glob packages/**/dist && rimraf --glob tools/**/dist && rimraf --glob docs/**/dist && rimraf --glob apps/**/dist && rimraf --glob libs/**/dist";
|
|
2224
|
-
json.scripts.nuke =
|
|
2225
|
-
json.scripts.prebuild =
|
|
2283
|
+
json.scripts.nuke = `nx clear-cache && rimraf .nx/cache && rimraf .nx/workspace-data && ${packageManager} clean && rimraf ${lockFileName} && rimraf --glob packages/**/node_modules && rimraf --glob tools/**/node_modules && rimraf node_modules`;
|
|
2284
|
+
json.scripts.prebuild = `${packageManager} clean`;
|
|
2226
2285
|
json.scripts.build = "nx affected -t build --parallel=5";
|
|
2227
2286
|
json.scripts["build-all"] = "nx run-many -t build --all --parallel=5";
|
|
2228
2287
|
json.scripts["build-prod"] = "nx run-many -t build --all --prod --parallel=5";
|
|
@@ -2237,45 +2296,53 @@ async function presetGeneratorFn(tree, options) {
|
|
|
2237
2296
|
}
|
|
2238
2297
|
json.scripts.nx = "nx";
|
|
2239
2298
|
json.scripts.graph = "nx graph";
|
|
2240
|
-
json.scripts.lint = "pnpm storm-lint all --skip-cspell --skip-alex";
|
|
2241
2299
|
if (options.includeApps) {
|
|
2242
2300
|
json.scripts.start = "nx serve";
|
|
2243
|
-
json.scripts.storybook = "
|
|
2301
|
+
json.scripts.storybook = pmc.run("storybook", "dev -p 6006");
|
|
2244
2302
|
}
|
|
2245
2303
|
json.scripts.help = "nx help";
|
|
2246
2304
|
json.scripts["dep-graph"] = "nx dep-graph";
|
|
2247
2305
|
json.scripts["local-registry"] = `nx local-registry @${options.namespace}/${options.name}`;
|
|
2248
2306
|
json.scripts.e2e = "nx e2e";
|
|
2249
2307
|
if (options.includeApps) {
|
|
2250
|
-
json.scripts.test =
|
|
2251
|
-
json.scripts["test-storybook"] =
|
|
2308
|
+
json.scripts.test = `nx test && ${packageManager} test-storybook`;
|
|
2309
|
+
json.scripts["test-storybook"] = `${packageManager} test-storybook`;
|
|
2252
2310
|
} else {
|
|
2253
2311
|
json.scripts.test = "nx test";
|
|
2254
2312
|
}
|
|
2255
|
-
json.scripts.
|
|
2256
|
-
json.scripts
|
|
2257
|
-
|
|
2258
|
-
|
|
2313
|
+
json.scripts.commit = pmc.run("storm-git", "commit");
|
|
2314
|
+
json.scripts["api-extractor"] = pmc.run(
|
|
2315
|
+
"storm-docs",
|
|
2316
|
+
'api-extractor --outputPath="docs/api-reference" --clean'
|
|
2317
|
+
);
|
|
2318
|
+
json.scripts.release = pmc.run("storm-git", "release");
|
|
2259
2319
|
json.scripts.format = "nx format:write";
|
|
2260
|
-
json.scripts["format-sherif"] =
|
|
2261
|
-
json.scripts["format-toml"] =
|
|
2262
|
-
json.scripts["format-readme"] =
|
|
2263
|
-
|
|
2264
|
-
|
|
2265
|
-
|
|
2266
|
-
json.scripts["
|
|
2267
|
-
json.scripts
|
|
2268
|
-
json.
|
|
2320
|
+
json.scripts["format-sherif"] = `${pmc.exec} sherif -f -i typescript -i react -i react-dom`;
|
|
2321
|
+
json.scripts["format-toml"] = `${pmc.exec} taplo format --config="./node_modules/@storm-software/linting-tools/taplo/config.toml" --cache-path="./node_modules/.cache/storm/taplo"`;
|
|
2322
|
+
json.scripts["format-readme"] = pmc.run(
|
|
2323
|
+
"storm-git",
|
|
2324
|
+
'readme --templates="tools/readme-templates"'
|
|
2325
|
+
);
|
|
2326
|
+
json.scripts["format-prettier"] = `${pmc.exec} prettier --write --ignore-unknown --no-error-on-unmatched-pattern --cache && git update-index`;
|
|
2327
|
+
json.scripts.lint = pmc.run("storm-lint", "all --skip-cspell");
|
|
2328
|
+
json.scripts["lint-knip"] = `${pmc.exec} knip`;
|
|
2329
|
+
json.scripts["lint-sherif"] = `${pmc.exec} sherif -i typescript -i react -i react-dom`;
|
|
2330
|
+
json.scripts["lint-ls"] = `${pmc.exec} ls-lint --config="./node_modules/@storm-software/linting-tools/ls-lint/ls-lint.yml"`;
|
|
2331
|
+
json.packageManager ??= `${packageManager}@${packageManagerVersion}`;
|
|
2269
2332
|
json.engines = {
|
|
2270
2333
|
node: `>=${nodeVersion}`,
|
|
2271
|
-
|
|
2334
|
+
[packageManager]: `>=${packageManagerVersion}`
|
|
2272
2335
|
};
|
|
2273
2336
|
return json;
|
|
2274
2337
|
});
|
|
2275
2338
|
generateFiles4(tree, path2.join(__dirname, "files"), projectRoot, {
|
|
2276
2339
|
...options,
|
|
2340
|
+
packageManager,
|
|
2341
|
+
packageManagerVersion,
|
|
2277
2342
|
pnpmVersion,
|
|
2278
|
-
nodeVersion
|
|
2343
|
+
nodeVersion,
|
|
2344
|
+
lockFileName,
|
|
2345
|
+
exec: pmc.exec
|
|
2279
2346
|
});
|
|
2280
2347
|
await formatFiles7(tree);
|
|
2281
2348
|
let dependencies = {
|
|
@@ -2731,33 +2798,6 @@ import https2 from "node:https";
|
|
|
2731
2798
|
// ../workspace-tools/src/utils/get-project-configurations.ts
|
|
2732
2799
|
import { retrieveProjectConfigurationsWithoutPluginInference } from "nx/src/project-graph/utils/retrieve-workspace-files";
|
|
2733
2800
|
|
|
2734
|
-
// ../workspace-tools/src/utils/lock-file.ts
|
|
2735
|
-
import {
|
|
2736
|
-
output,
|
|
2737
|
-
readJsonFile,
|
|
2738
|
-
workspaceRoot
|
|
2739
|
-
} from "@nx/devkit";
|
|
2740
|
-
import { existsSync as existsSync6 } from "node:fs";
|
|
2741
|
-
import { join as join2 } from "node:path";
|
|
2742
|
-
import {
|
|
2743
|
-
getNpmLockfileDependencies,
|
|
2744
|
-
getNpmLockfileNodes
|
|
2745
|
-
} from "nx/src/plugins/js/lock-file/npm-parser";
|
|
2746
|
-
import {
|
|
2747
|
-
getPnpmLockfileDependencies,
|
|
2748
|
-
getPnpmLockfileNodes
|
|
2749
|
-
} from "nx/src/plugins/js/lock-file/pnpm-parser";
|
|
2750
|
-
import {
|
|
2751
|
-
getYarnLockfileDependencies,
|
|
2752
|
-
getYarnLockfileNodes
|
|
2753
|
-
} from "nx/src/plugins/js/lock-file/yarn-parser";
|
|
2754
|
-
var YARN_LOCK_FILE = "yarn.lock";
|
|
2755
|
-
var NPM_LOCK_FILE = "package-lock.json";
|
|
2756
|
-
var PNPM_LOCK_FILE = "pnpm-lock.yaml";
|
|
2757
|
-
var YARN_LOCK_PATH = join2(workspaceRoot, YARN_LOCK_FILE);
|
|
2758
|
-
var NPM_LOCK_PATH = join2(workspaceRoot, NPM_LOCK_FILE);
|
|
2759
|
-
var PNPM_LOCK_PATH = join2(workspaceRoot, PNPM_LOCK_FILE);
|
|
2760
|
-
|
|
2761
2801
|
// ../workspace-tools/config/recommended.json
|
|
2762
2802
|
var recommended_default = {
|
|
2763
2803
|
$schema: "https://cdn.jsdelivr.net/npm/nx/schemas/nx-schema.json",
|
|
@@ -2766,15 +2806,12 @@ var recommended_default = {
|
|
|
2766
2806
|
allProjectFiles: ["sharedGlobals", "{projectRoot}/**/*"],
|
|
2767
2807
|
default: ["sharedGlobals", "{projectRoot}/**/*"],
|
|
2768
2808
|
sharedGlobals: [
|
|
2769
|
-
"{workspaceRoot}/.github/workflows/*.yml",
|
|
2770
|
-
"{workspaceRoot}/assets/**/*",
|
|
2771
2809
|
"{workspaceRoot}/tsconfig.json",
|
|
2772
|
-
"{workspaceRoot}/tsconfig
|
|
2810
|
+
"{workspaceRoot}/tsconfig.*.json",
|
|
2773
2811
|
"{workspaceRoot}/.npm@(rc|ignore)",
|
|
2774
2812
|
"{workspaceRoot}/package.json",
|
|
2775
2813
|
"{workspaceRoot}/{pnpm-workspace,pnpm-lock,package-lock,yarn-lock}.@(yaml|yml)",
|
|
2776
|
-
"{workspaceRoot}/bun.
|
|
2777
|
-
"{workspaceRoot}/LICENSE",
|
|
2814
|
+
"{workspaceRoot}/bun.lock{,b}",
|
|
2778
2815
|
"{workspaceRoot}/.git@(attributes|ignore)",
|
|
2779
2816
|
"{workspaceRoot}/{nx.json,.nxignore}",
|
|
2780
2817
|
"{workspaceRoot}/storm-workspace{,.*}.@(json|yaml|toml)",
|
|
@@ -2782,7 +2819,6 @@ var recommended_default = {
|
|
|
2782
2819
|
"{workspaceRoot}/storm-workspace.config.[jt]s",
|
|
2783
2820
|
"{workspaceRoot}/.storm-workspace/config{,.*}.[jt]s",
|
|
2784
2821
|
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
2785
|
-
"{workspaceRoot}/{flake,shell,devShell}.nix",
|
|
2786
2822
|
"{workspaceRoot}/.envrc",
|
|
2787
2823
|
"{workspaceRoot}/.env{,.local,.*}"
|
|
2788
2824
|
],
|
|
@@ -2889,14 +2925,12 @@ var recommended_default = {
|
|
|
2889
2925
|
"{workspaceRoot}/Cargo.lock",
|
|
2890
2926
|
"{workspaceRoot}/.cargo/config.toml",
|
|
2891
2927
|
"{workspaceRoot}/rust-toolchain",
|
|
2892
|
-
"{workspaceRoot}/rustfmt.toml",
|
|
2893
|
-
"{workspaceRoot}/deny.toml",
|
|
2894
2928
|
"{projectRoot}/Cargo.toml",
|
|
2895
2929
|
"{projectRoot}/.cargo/config.toml",
|
|
2896
2930
|
{
|
|
2897
2931
|
runtime: "node -p '`${process.platform}_${process.arch}`'"
|
|
2898
2932
|
},
|
|
2899
|
-
"{projectRoot}/
|
|
2933
|
+
"{projectRoot}/project.json",
|
|
2900
2934
|
"{projectRoot}/.env{,.local}",
|
|
2901
2935
|
"{projectRoot}/**/*.rs",
|
|
2902
2936
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
@@ -2915,14 +2949,22 @@ var recommended_default = {
|
|
|
2915
2949
|
"{projectRoot}/package.json",
|
|
2916
2950
|
"{projectRoot}/tsconfig.json",
|
|
2917
2951
|
"{projectRoot}/tsconfig.*.json",
|
|
2918
|
-
"{projectRoot}/
|
|
2952
|
+
"{projectRoot}/project.json",
|
|
2919
2953
|
"{projectRoot}/.env{,.*}",
|
|
2920
|
-
"{projectRoot}/docs/**/*",
|
|
2921
|
-
"{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
2954
|
+
"!{projectRoot}/docs/**/*",
|
|
2955
|
+
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
|
|
2922
2956
|
"{projectRoot}/**/*.@(proto|acid|acidic|prisma)",
|
|
2923
2957
|
"{projectRoot}/src/**/*.@(cts|mts|ts|tsx|graphql|gql|js|cjs|mjs|jsx|json|jsonc|yaml|yml|toml|md|mdx)",
|
|
2924
2958
|
"{projectRoot}/{build,tsup,tsdown,vite,contentlayer,powerlines,shell-shock,earthquake}.*.[jt]s?(x)",
|
|
2925
2959
|
"{projectRoot}/{bin,tools,helpers,scripts}/**/*"
|
|
2960
|
+
],
|
|
2961
|
+
ci: [
|
|
2962
|
+
"sharedGlobals",
|
|
2963
|
+
"{workspaceRoot}/.github/workflows/*.yml",
|
|
2964
|
+
"{workspaceRoot}/assets/**/*",
|
|
2965
|
+
"{workspaceRoot}/devenv.@(lock|nix|yaml)",
|
|
2966
|
+
"{workspaceRoot}/.devenv{,.flake.nix}",
|
|
2967
|
+
"{workspaceRoot}/.direnv"
|
|
2926
2968
|
]
|
|
2927
2969
|
},
|
|
2928
2970
|
targetDefaults: {
|
|
@@ -2933,8 +2975,8 @@ var recommended_default = {
|
|
|
2933
2975
|
executor: "nx:run-commands",
|
|
2934
2976
|
options: {
|
|
2935
2977
|
commands: [
|
|
2936
|
-
"
|
|
2937
|
-
"
|
|
2978
|
+
"rimraf --glob {projectRoot}/dist",
|
|
2979
|
+
"rimraf dist/{projectRoot}"
|
|
2938
2980
|
]
|
|
2939
2981
|
}
|
|
2940
2982
|
},
|
|
@@ -2954,7 +2996,7 @@ var recommended_default = {
|
|
|
2954
2996
|
version: {
|
|
2955
2997
|
currentVersionResolver: "git-tag",
|
|
2956
2998
|
specifierSource: "conventional-commits",
|
|
2957
|
-
groupPreVersionCommand: "
|
|
2999
|
+
groupPreVersionCommand: "build",
|
|
2958
3000
|
manifestRootsToUpdate: [
|
|
2959
3001
|
"{projectRoot}",
|
|
2960
3002
|
{
|
|
@@ -3007,7 +3049,7 @@ import {
|
|
|
3007
3049
|
readJsonFile as readJsonFile2
|
|
3008
3050
|
} from "@nx/devkit";
|
|
3009
3051
|
import defu4 from "defu";
|
|
3010
|
-
import { existsSync as
|
|
3052
|
+
import { existsSync as existsSync5 } from "node:fs";
|
|
3011
3053
|
import { dirname, join as join3 } from "node:path";
|
|
3012
3054
|
|
|
3013
3055
|
// ../workspace-tools/src/utils/typia-transform.ts
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
generator_default
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-MCCHKUCS.mjs";
|
|
4
4
|
import {
|
|
5
5
|
findWorkspaceRoot,
|
|
6
6
|
getConfig
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
} from "./chunk-K4H5ZMYA.mjs";
|
|
17
17
|
import {
|
|
18
18
|
__dirname
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-WPIQWFHD.mjs";
|
|
20
20
|
|
|
21
21
|
// src/generators/worker/generator.ts
|
|
22
22
|
import {
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
__commonJS
|
|
3
|
-
} from "./chunk-
|
|
3
|
+
} from "./chunk-WPIQWFHD.mjs";
|
|
4
4
|
|
|
5
5
|
// package.json
|
|
6
6
|
var require_package = __commonJS({
|
|
7
7
|
"package.json"(exports, module) {
|
|
8
|
-
module.exports = { name: "@storm-software/cloudflare-tools", version: "0.71.
|
|
8
|
+
module.exports = { name: "@storm-software/cloudflare-tools", version: "0.71.247", private: false, description: "A Nx plugin package that contains various executors, generators, and utilities that assist in managing Cloudflare services.", keywords: ["monorepo", "open-system", "storm", "storm-ops", "storm-stack", "stormstack", "sullivanpj"], homepage: "https://stormsoftware.com", bugs: "https://github.com/storm-software/storm-ops/issues", repository: { type: "github", url: "https://github.com/storm-software/storm-ops.git", directory: "packages/cloudflare-tools" }, license: "Apache-2.0", author: { name: "Storm Software", email: "contact@stormsoftware.com", url: "https://stormsoftware.com" }, exports: { "./package.json": "./package.json", "./docs/*": "./docs/*", "./migrations.json": "./migrations.json", "./executors.json": "./executors.json", "./executors/*/schema.json": "./dist/src/executors/*/schema.json", "./generators.json": "./generators.json", "./generators/*/schema.json": "./dist/src/generators/*/schema.json", ".": { import: { types: "./dist/index.d.mts", default: "./dist/index.mjs" }, require: { types: "./dist/index.d.ts", default: "./dist/index.js" }, default: { types: "./dist/index.d.ts", default: "./dist/index.js" } }, "./index": { import: { types: "./dist/index.d.mts", default: "./dist/index.mjs" }, require: { types: "./dist/index.d.ts", default: "./dist/index.js" }, default: { types: "./dist/index.d.ts", default: "./dist/index.js" } }, "./executors": { import: { types: "./dist/executors.d.mts", default: "./dist/executors.mjs" }, require: { types: "./dist/executors.d.ts", default: "./dist/executors.js" }, default: { types: "./dist/executors.d.ts", default: "./dist/executors.js" } }, "./executors/*": { import: { types: "./dist/src/executors/*.d.mts", default: "./dist/src/executors/*.mjs" }, require: { types: "./dist/src/executors/*.d.ts", default: "./dist/src/executors/*.js" }, default: { types: "./dist/src/executors/*.d.ts", default: "./dist/src/executors/*.js" } }, "./generators": { import: { types: "./dist/generators.d.mts", default: "./dist/generators.mjs" }, require: { types: "./dist/generators.d.ts", default: "./dist/generators.js" }, default: { types: "./dist/generators.d.ts", default: "./dist/generators.js" } }, "./generators/*": { import: { types: "./dist/src/generators/*.d.mts", default: "./dist/src/generators/*.mjs" }, require: { types: "./dist/src/generators/*.d.ts", default: "./dist/src/generators/*.js" }, default: { types: "./dist/src/generators/*.d.ts", default: "./dist/src/generators/*.js" } }, "./utils": { import: { types: "./dist/src/utils/index.d.mts", default: "./dist/src/utils/index.mjs" }, require: { types: "./dist/src/utils/index.d.ts", default: "./dist/src/utils/index.js" }, default: { types: "./dist/src/utils/index.d.ts", default: "./dist/src/utils/index.js" } }, "./utils/*": { import: { types: "./dist/src/utils/*.d.mts", default: "./dist/src/utils/*.mjs" }, require: { types: "./dist/src/utils/*.d.ts", default: "./dist/src/utils/*.js" }, default: { types: "./dist/src/utils/*.d.ts", default: "./dist/src/utils/*.js" } }, "./executors/*/executor.js": "./dist/src/executors/*/executor.js", "./generators/*/generator.js": "./dist/src/generators/*/generator.js", "./plugin": "./dist/src/plugins/index.js" }, main: "dist/index.js", module: "dist/index.mjs", typings: "dist/index.d.ts", dependencies: { "@aws-sdk/client-s3": "^3.1087.0", "@aws-sdk/lib-storage": "^3.1087.0", "@smithy/node-http-handler": "^4.9.6", "@storm-software/config": "workspace:*", "@storm-software/config-tools": "workspace:*", "@storm-software/workspace-tools": "workspace:*", defu: "catalog:", glob: "catalog:", "mime-types": "^3.0.2", "pretty-bytes": "^7.1.0" }, devDependencies: { "@nx/devkit": "catalog:", "@nx/node": "catalog:", "@nx/web": "catalog:", "@nx/webpack": "catalog:", "@smithy/protocol-http": "^5.5.9", nx: "catalog:", tsup: "catalog:", untyped: "catalog:", wrangler: "^4.111.0" }, peerDependencies: { nx: ">=22.7.1", wrangler: ">=3.58.0" }, peerDependenciesMeta: { nx: { optional: false }, wrangler: { optional: false } }, publishConfig: { access: "public" }, executors: "./executors.json", generators: "./generators.json" };
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
|