@storm-software/cloudflare-tools 0.24.1 → 0.26.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/cloudflare-tools",
-  "version": "0.24.1",
+  "version": "0.26.0",
   "type": "commonjs",
   "description": "⚡The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
   "repository": {

package/packages/build-tools/src/utils/generate-package-json.d.ts

@@ -4,3 +4,4 @@ import type { TypeScriptBuildOptions } from "../../declarations";
 export declare const generatePackageJson: (config: StormConfig, projectRoot: string, sourceRoot: string, projectName: string, options: TypeScriptBuildOptions) => Promise<Record<string, any>>;
 export declare const formatPackageJson: (config: StormConfig, projectRoot: string, sourceRoot: string, projectName: string, options: Pick<TypeScriptBuildOptions, "tsConfig" | "external" | "generatePackageJson" | "bundle" | "includeSrc">, packageJson: Record<string, any>, projectGraph: ProjectGraph, projectsConfigurations: Record<string, ProjectConfiguration>) => Promise<Record<string, any>>;
 export declare const addWorkspacePackageJsonFields: (config: StormConfig, projectRoot: string, sourceRoot: string, projectName: string, includeSrc: boolean | undefined, packageJson: Record<string, any>) => Record<string, any>;
+export declare const addPackageJsonExports: (sourceRoot: string, packageJson: Record<string, any>) => Promise<Record<string, any>>;

package/packages/config/src/define-config.d.ts

@@ -148,7 +148,6 @@ export declare const defineConfig: (input: StormConfigInput) => {
     owner?: string | undefined;
     worker?: string | undefined;
     env?: "development" | "staging" | "production" | undefined;
-    ci?: boolean | undefined;
     workspaceRoot?: string | undefined;
     packageDirectory?: string | undefined;
     externalPackagePatterns?: string[] | undefined;

package/packages/config/src/schema.d.ts

@@ -922,7 +922,6 @@ export declare const StormConfigSchema: z.ZodObject<{
     owner: z.ZodDefault<z.ZodString>;
     worker: z.ZodDefault<z.ZodString>;
     env: z.ZodDefault<z.ZodEnum<["development", "staging", "production"]>>;
-    ci: z.ZodDefault<z.ZodBoolean>;
     workspaceRoot: z.ZodDefault<z.ZodString>;
     packageDirectory: z.ZodOptional<z.ZodString>;
     externalPackagePatterns: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
@@ -1588,7 +1587,6 @@ export declare const StormConfigSchema: z.ZodObject<{
     owner: string;
     worker: string;
     env: "development" | "staging" | "production";
-    ci: boolean;
     workspaceRoot: string;
     externalPackagePatterns: string[];
     skipCache: boolean;
@@ -1887,7 +1885,6 @@ export declare const StormConfigSchema: z.ZodObject<{
     owner?: string | undefined;
     worker?: string | undefined;
     env?: "development" | "staging" | "production" | undefined;
-    ci?: boolean | undefined;
     workspaceRoot?: string | undefined;
     packageDirectory?: string | undefined;
     externalPackagePatterns?: string[] | undefined;

package/packages/config-tools/src/utilities/run.d.ts

@@ -11,6 +11,8 @@ export type StdioOptions = IOType | Array<IOType | "ipc" | number | null | undef
  * @param config - The Storm configuration object
  * @param command - The command to run
  * @param cwd - The current working directory
+ * @param stdio - The standard input/output options
+ * @param env - The environment variables
  * @returns The result of the command
  */
-export declare const run: (config: StormConfig, command: string, cwd?: string, stdio?: StdioOptions) => Buffer;
+export declare const run: (config: StormConfig, command: string, cwd?: string, stdio?: StdioOptions, env?: NodeJS.ProcessEnv) => Buffer;

package/packages/workspace-tools/src/base/base-executor.d.ts

@@ -1,4 +1,7 @@
 import type { ExecutorContext, PromiseExecutor } from "@nx/devkit";
 import type { StormConfig } from "@storm-software/config";
-import type { BaseExecutorOptions, BaseExecutorResult, BaseExecutorSchema } from "../../declarations";
-export declare const withRunExecutor: <TExecutorSchema extends BaseExecutorSchema = BaseExecutorSchema>(name: string, executorFn: (options: TExecutorSchema, context: ExecutorContext, config: StormConfig) => Promise<BaseExecutorResult | null | undefined> | AsyncGenerator<any, BaseExecutorResult | null | undefined> | BaseExecutorResult | null | undefined, executorOptions: BaseExecutorOptions<TExecutorSchema>) => PromiseExecutor<TExecutorSchema>;
+import type { BaseExecutorOptions as _BaseExecutorOptions, BaseExecutorResult as _BaseExecutorResult, BaseExecutorSchema as _BaseExecutorSchema } from "../../declarations";
+export type BaseExecutorOptions<TExecutorSchema extends BaseExecutorSchema = BaseExecutorSchema> = _BaseExecutorOptions<TExecutorSchema>;
+export type BaseExecutorResult = _BaseExecutorResult;
+export type BaseExecutorSchema = _BaseExecutorSchema;
+export declare const withRunExecutor: <TExecutorSchema extends BaseExecutorSchema = _BaseExecutorSchema>(name: string, executorFn: (options: TExecutorSchema, context: ExecutorContext, config: StormConfig) => Promise<BaseExecutorResult | null | undefined> | AsyncGenerator<any, BaseExecutorResult | null | undefined> | BaseExecutorResult | null | undefined, executorOptions?: BaseExecutorOptions<TExecutorSchema>) => PromiseExecutor<TExecutorSchema>;

package/packages/workspace-tools/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from "@nx/devkit";
 import type { Schema } from "./schema";
-export declare function stormInitGenerator(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export default stormInitGenerator;
+export declare function initGenerator(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export default initGenerator;

package/src/executors/cloudflare-publish/executor.js

@@ -65400,9 +65400,6 @@ var init_schema = __esm({
         "The worker of the package (this is the bot that will be used to perform various tasks)"
       ),
       env: z2.enum(["development", "staging", "production"]).default("production").describe("The current runtime environment of the package"),
-      ci: z2.boolean().default(true).describe(
-        "An indicator specifying if the current environment is a CI environment"
-      ),
       workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
       packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
       externalPackagePatterns: z2.array(z2.string()).default([]).describe(
@@ -65529,7 +65526,6 @@ var init_get_default_config = __esm({
       env: "production",
       branch: "main",
       organization: "storm-software",
-      ci: true,
       configFile: null,
       runtimeVersion: "1.0.0",
       colors: { ...DEFAULT_COLOR_CONFIG },
@@ -67436,11 +67432,13 @@ var init_run = __esm({
   "packages/config-tools/src/utilities/run.ts"() {
     import_node_child_process5 = require("node:child_process");
     LARGE_BUFFER = 1024 * 1e6;
-    run = (config, command, cwd2 = config.workspaceRoot ?? process.cwd(), stdio = "inherit") => {
+    run = (config, command, cwd2 = config.workspaceRoot ?? process.cwd(), stdio = "inherit", env = process.env) => {
       return (0, import_node_child_process5.execSync)(command, {
         cwd: cwd2,
         env: {
           ...process.env,
+          ...env,
+          CLICOLOR: "true",
           FORCE_COLOR: "true"
         },
         stdio,
@@ -67682,9 +67680,14 @@ var init_get_env = __esm({
         runtimeVersion: process.env[`${prefix}RUNTIME_VERSION`],
         outputDirectory: correctPaths(process.env[`${prefix}OUTPUT_DIRECTORY`]),
         env: process.env[`${prefix}ENV`] ?? process.env.NODE_ENV ?? process.env.ENVIRONMENT,
-        ci: process.env[`${prefix}CI`] !== void 0 ? Boolean(
-          process.env[`${prefix}CI`] ?? process.env.CI ?? process.env.CONTINUOUS_INTEGRATION
-        ) : void 0,
+        // ci:
+        //   process.env[`${prefix}CI`] !== undefined
+        //     ? Boolean(
+        //         process.env[`${prefix}CI`] ??
+        //           process.env.CI ??
+        //           process.env.CONTINUOUS_INTEGRATION
+        //       )
+        //     : undefined,
         repository: process.env[`${prefix}REPOSITORY`],
         branch: process.env[`${prefix}BRANCH`],
         preid: process.env[`${prefix}PRE_ID`],
@@ -67885,11 +67888,6 @@ var init_set_env = __esm({
         process.env.NODE_ENV = config.env;
         process.env.ENVIRONMENT = config.env;
       }
-      if (config.ci) {
-        process.env[`${prefix}CI`] = String(config.ci);
-        process.env.CI = String(config.ci);
-        process.env.CONTINUOUS_INTEGRATION = String(config.ci);
-      }
       if (config.colors?.base?.light || config.colors?.base?.dark) {
         for (const key of Object.keys(config.colors)) {
           setThemeColorConfigEnv(`${prefix}COLOR_${key}_`, config.colors[key]);
@@ -68058,7 +68056,7 @@ var init_create_storm_config = __esm({
     };
     createStormConfig = (extensionName, schema, workspaceRoot3) => {
       let result;
-      if (!_static_cache) {
+      if (!_static_cache?.data || !_static_cache?.timestamp || _static_cache.timestamp < Date.now() - 3e4) {
         const config = getConfigEnv();
         const defaultConfig = getDefaultConfig(config, workspaceRoot3);
         result = StormConfigSchema.parse({
@@ -68071,7 +68069,7 @@ var init_create_storm_config = __esm({
         });
         result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot3);
       } else {
-        result = _static_cache;
+        result = _static_cache.data;
       }
       if (schema && extensionName) {
         result.extensions = {
@@ -68079,7 +68077,10 @@ var init_create_storm_config = __esm({
           [extensionName]: createConfigExtension(extensionName, schema)
         };
       }
-      _static_cache = result;
+      _static_cache = {
+        timestamp: Date.now(),
+        data: result
+      };
       return result;
     };
     createConfigExtension = (extensionName, schema) => {
@@ -68096,6 +68097,13 @@ var init_create_storm_config = __esm({
     };
     loadStormConfig = async (workspaceRoot3) => {
       let config = {};
+      if (_static_cache?.data && _static_cache?.timestamp && _static_cache.timestamp >= Date.now() + 3e4) {
+        writeInfo(
+          `Configuration cache hit - ${_static_cache.timestamp}`,
+          _static_cache.data
+        );
+        return _static_cache.data;
+      }
       let _workspaceRoot = workspaceRoot3;
       if (!_workspaceRoot) {
         _workspaceRoot = findWorkspaceRoot();
@@ -207045,9 +207053,9 @@ ${lanes.join("\n")}
         function checkDeprecations(deprecatedIn, stopsWorkingIn, removedIn, createDiagnostic, fn2) {
           const deprecatedInVersion = new Version(deprecatedIn);
           const removedInVersion = new Version(removedIn);
-          const typescriptVersion2 = new Version(typeScriptVersion3 || versionMajorMinor);
+          const typescriptVersion = new Version(typeScriptVersion3 || versionMajorMinor);
           const ignoreDeprecationsVersion = getIgnoreDeprecationsVersion();
-          const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion2) === 1);
+          const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion) === 1);
           const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === -1;
           if (mustBeRemoved || canBeSilenced) {
             fn2((name, value2, useInstead) => {
@@ -421380,9 +421388,9 @@ ${lanes.join("\n")}
         function checkDeprecations(deprecatedIn, removedIn, createDiagnostic, fn2) {
           const deprecatedInVersion = new Version(deprecatedIn);
           const removedInVersion = new Version(removedIn);
-          const typescriptVersion2 = new Version(typeScriptVersion3 || versionMajorMinor);
+          const typescriptVersion = new Version(typeScriptVersion3 || versionMajorMinor);
           const ignoreDeprecationsVersion = getIgnoreDeprecationsVersion();
-          const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion2) === 1);
+          const mustBeRemoved = !(removedInVersion.compareTo(typescriptVersion) === 1);
           const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === -1;
           if (mustBeRemoved || canBeSilenced) {
             fn2((name, value2, useInstead) => {
@@ -605970,7 +605978,7 @@ var applyWorkspaceExecutorTokens = async (option, tokenizerOptions) => {
 };
 
 // packages/workspace-tools/src/base/base-executor.ts
-var withRunExecutor = (name, executorFn, executorOptions) => async (_options, context) => {
+var withRunExecutor = (name, executorFn, executorOptions = {}) => async (_options, context) => {
   const {
     getStopwatch: getStopwatch2,
     writeDebug: writeDebug2,
@@ -606198,7 +606206,6 @@ var import_generator = __toESM(require_generator());
 
 // packages/workspace-tools/src/utils/versions.ts
 var typesNodeVersion = "20.9.0";
-var typescriptVersion = "~5.2.2";
 var nxVersion = "^18.0.4";
 var nodeVersion = "20.11.0";
 var pnpmVersion = "8.10.2";
@@ -618539,7 +618546,7 @@ async function presetGeneratorFn(tree, options) {
     ];
     json.homepage ??= "https://stormsoftware.com";
     json.bugs ??= {
-      url: "https://stormsoftware.com/support",
+      url: `https://github.com/${options.organization}/${options.name}/issues`,
       email: "support@stormsoftware.com"
     };
     json.license = "Apache-2.0";
@@ -618548,17 +618555,49 @@ async function presetGeneratorFn(tree, options) {
       email: "contact@stormsoftware.com",
       url: "https://stormsoftware.com"
     };
+    json.maintainers ??= [
+      {
+        "name": "Storm Software",
+        "email": "contact@stormsoftware.com",
+        "url": "https://stormsoftware.com"
+      },
+      {
+        "name": "Pat Sullivan",
+        "email": "pat@stormsoftware.com",
+        "url": "https://patsullivan.org"
+      }
+    ];
     json.funding ??= {
       type: "github",
       url: "https://github.com/sponsors/storm-software"
     };
     json.namespace ??= `@${options.namespace}`;
     json.description ??= options.description;
-    options.repositoryUrl ??= `https://github.com/${options.organization}/${options.name}}`;
+    options.repositoryUrl ??= `https://github.com/${options.organization}/${options.name}`;
     json.repository ??= {
       type: "github",
       url: `${options.repositoryUrl}.git`
     };
+    json.packageManager ??= "pnpm@9.6.0";
+    json.engines ??= {
+      "node": ">=20.11.0",
+      "pnpm": ">=9.6.0"
+    };
+    json.devEngines ??= {
+      "node": "20.x || 21.x"
+    };
+    json.nx ??= {
+      "includedScripts": [
+        "lint-ls",
+        "lint",
+        "format",
+        "format-readme",
+        "format-prettier",
+        "format-toml",
+        "commit",
+        "release"
+      ]
+    };
     json.scripts.adr = "pnpm log4brains adr new";
     json.scripts["adr-preview"] = "pnpm log4brains preview";
     json.scripts.prepare = "pnpm add lefthook -w && pnpm lefthook install";
@@ -618615,25 +618654,6 @@ async function presetGeneratorFn(tree, options) {
       node: `>=${nodeVersion}`,
       pnpm: `>=${pnpmVersion}`
     };
-    if (options.includeApps) {
-      json.bundlewatch = {
-        files: [
-          {
-            path: "dist/*/*.js",
-            maxSize: "200kB"
-          }
-        ],
-        ci: {
-          trackBranches: ["main", "alpha", "beta"]
-        }
-      };
-      json.nextBundleAnalysis = {
-        buildOutputDirectory: "dist/apps/web/app/.next"
-      };
-    }
-    json.nx = {
-      includedScripts: ["lint", "format"]
-    };
     return json;
   });
   (0, import_devkit10.generateFiles)(tree, path7.join(__dirname, "files"), projectRoot, {
@@ -618643,15 +618663,15 @@ async function presetGeneratorFn(tree, options) {
   });
   await (0, import_devkit10.formatFiles)(tree);
   let dependencies = {
-    "@commitlint/cli": "19.2.1",
     "@ls-lint/ls-lint": "2.2.3",
     "@ltd/j-toml": "1.38.0",
-    "@nx/devkit": "19.1.0",
-    "@nx/esbuild": "19.1.0",
-    "@nx/eslint": "19.1.0",
-    "@nx/js": "19.1.0",
-    "@nx/plugin": "19.1.0",
-    "@nx/workspace": "19.1.0",
+    "@microsoft/tsdoc": "0.15.0",
+    "@nx/devkit": "^19.5.3",
+    "@nx/esbuild": "19.5.3",
+    "@nx/eslint-plugin": ">=19.5.3",
+    "@nx/js": "^19.5.3",
+    "@nx/plugin": "19.5.3",
+    "@nx/workspace": "^19.5.3",
     "@storm-software/config": "latest",
     "@storm-software/config-tools": "latest",
     "@storm-software/git-tools": "latest",
@@ -618661,44 +618681,35 @@ async function presetGeneratorFn(tree, options) {
     "@storm-software/eslint": "latest",
     "@storm-software/eslint-plugin": "latest",
     "@storm-software/prettier": "latest",
-    "@swc-node/register": "1.9.0",
-    "@swc/cli": "0.3.12",
-    "@swc/core": "1.4.12",
-    "@swc/helpers": "0.5.8",
-    "@swc/wasm": "1.4.12",
     "@taplo/cli": "0.7.0",
     "@types/jest": "29.5.12",
-    "@types/node": "20.12.5",
-    "conventional-changelog-conventionalcommits": "7.0.2",
-    "esbuild": "0.20.2",
+    "@types/node": "^20.14.10",
+    "conventional-changelog-conventionalcommits": "8.0.0",
+    "copyfiles": "2.4.1",
+    "esbuild": "0.21.5",
     "esbuild-register": "3.5.0",
-    "eslint": "^9.0.0",
-    "eslint-config-storm-software": "latest",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-react": "^7.34.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint": "9.5.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-environment-node": "29.7.0",
-    "lefthook": "1.6.8",
-    "nx": "19.1.0",
-    "prettier": "3.2.5",
-    "rimraf": "5.0.5",
-    "ts-jest": "29.1.2",
+    "knip": "5.25.2",
+    "lefthook": "1.6.18",
+    "nx": "^19.5.3",
+    "prettier": "3.3.2",
+    "prettier-plugin-prisma": "5.0.0",
+    "rimraf": "5.0.7",
+    "sherif": "0.10.0",
+    "ts-jest": "29.1.5",
     "ts-loader": "9.5.1",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
-    "tslib": "2.6.2",
-    "typescript": typescriptVersion,
-    "verdaccio": "5.30.3",
-    "knip": "5.25.2",
-    "sherif": "0.10.0"
+    "tslib": "2.6.3",
+    "typescript": "5.5.3",
+    "verdaccio": "5.31.1"
   };
   if (options.includeApps) {
     dependencies = {
       ...dependencies,
-      bundlewatch: "latest",
       react: "latest",
       "react-dom": "latest",
       storybook: "latest",