@storm-software/cloudflare-tools 0.71.11 → 0.71.13

package/dist/chunk-LR6YPKJY.mjs

@@ -1,265 +0,0 @@
-import {
-  findWorkspaceRoot,
-  getConfig
-} from "./chunk-SGTAZO2Q.mjs";
-import {
-  getStopwatch,
-  writeDebug,
-  writeError,
-  writeFatal,
-  writeInfo,
-  writeTrace
-} from "./chunk-TPNHSNNZ.mjs";
-import {
-  generator_default
-} from "./chunk-O2OONDQ5.mjs";
-import {
-  __dirname
-} from "./chunk-TYYFTZLS.mjs";
-
-// src/generators/worker/generator.ts
-import {
-  convertNxGenerator,
-  ensurePackage,
-  formatFiles,
-  generateFiles,
-  joinPathFragments,
-  names,
-  readProjectConfiguration,
-  runTasksInSerial,
-  updateJson,
-  updateProjectConfiguration
-} from "@nx/devkit";
-import { determineProjectNameAndRootOptions } from "@nx/devkit/src/generators/project-name-and-root-utils";
-import { applicationGenerator as nodeApplicationGenerator } from "@nx/node";
-import { nxVersion } from "@nx/node/src/utils/versions";
-import { join } from "path";
-
-// src/generators/worker/libs/get-account-id.ts
-function getAccountId(accountId) {
-  return `account_id = "${accountId}"`;
-}
-
-// src/generators/worker/libs/vitest-imports.ts
-var vitestImports = `import { describe, expect, it, beforeAll, afterAll } from 'vitest';`;
-
-// src/generators/worker/libs/vitest-script.ts
-var vitestScript = `"test": "vitest run"`;
-
-// src/generators/worker/generator.ts
-async function applicationGenerator(tree, schema) {
-  const stopwatch = getStopwatch("Storm Worker generator");
-  let config;
-  try {
-    writeInfo(`\u26A1 Running the Storm Worker generator...
-
-`, config);
-    const workspaceRoot = findWorkspaceRoot();
-    writeDebug(
-      `Loading the Storm Config from environment variables and storm.json file...
-- workspaceRoot: ${workspaceRoot}`,
-      config
-    );
-    config = await getConfig(workspaceRoot);
-    writeTrace(
-      `Loaded Storm config into env: 
-${Object.keys(process.env).map((key) => ` - ${key}=${JSON.stringify(process.env[key])}`).join("\n")}`,
-      config
-    );
-    const options = await normalizeOptions(tree, schema, config);
-    const tasks = [];
-    tasks.push(
-      await generator_default(tree, {
-        ...options,
-        skipFormat: true
-      })
-    );
-    tasks.push(
-      await nodeApplicationGenerator(tree, {
-        ...options,
-        framework: "none",
-        skipFormat: true,
-        unitTestRunner: options.unitTestRunner == "vitest" ? "none" : options.unitTestRunner,
-        e2eTestRunner: "none",
-        name: schema.name
-      })
-    );
-    if (options.unitTestRunner === "vitest") {
-      const { vitestGenerator, createOrEditViteConfig } = ensurePackage(
-        "@nx/vite",
-        nxVersion
-      );
-      const vitestTask = await vitestGenerator(tree, {
-        project: options.name,
-        uiFramework: "none",
-        coverageProvider: "v8",
-        skipFormat: true,
-        testEnvironment: "node"
-      });
-      tasks.push(vitestTask);
-      createOrEditViteConfig(
-        tree,
-        {
-          project: options.name,
-          includeLib: false,
-          includeVitest: true,
-          testEnvironment: "node"
-        },
-        true
-      );
-    }
-    addCloudflareFiles(tree, options);
-    updateTsAppConfig(tree, options);
-    addTargets(tree, options);
-    if (options.unitTestRunner === "none") {
-      removeTestFiles(tree, options);
-    }
-    if (!options.skipFormat) {
-      await formatFiles(tree);
-    }
-    if (options.template === "hono") {
-      tasks.push(() => {
-        const packageJsonPath = joinPathFragments(
-          options.directory ?? "",
-          "package.json"
-        );
-        if (tree.exists(packageJsonPath)) {
-          updateJson(tree, packageJsonPath, (json) => ({
-            ...json,
-            dependencies: {
-              hono: "4.4.0",
-              ...json?.dependencies
-            }
-          }));
-        }
-      });
-    }
-    return runTasksInSerial(...tasks);
-  } catch (error) {
-    return () => {
-      writeFatal(
-        "A fatal error occurred while running the generator - the process was forced to terminate",
-        config
-      );
-      writeError(
-        `An exception was thrown in the generator's process 
- - Details: ${error.message}
- - Stacktrace: ${error.stack}`,
-        config
-      );
-    };
-  } finally {
-    stopwatch();
-  }
-}
-function updateTsAppConfig(tree, options) {
-  updateJson(tree, join(options.appProjectRoot, "tsconfig.app.json"), (json) => {
-    json.compilerOptions = {
-      ...json.compilerOptions,
-      esModuleInterop: true,
-      target: "es2021",
-      lib: ["es2021"],
-      module: "es2022",
-      moduleResolution: "node",
-      resolveJsonModule: true,
-      allowJs: true,
-      checkJs: false,
-      noEmit: true,
-      isolatedModules: true,
-      allowSyntheticDefaultImports: true,
-      forceConsistentCasingInFileNames: true,
-      strict: true,
-      skipLibCheck: true
-    };
-    json.compilerOptions.types = [
-      ...json.compilerOptions.types,
-      "@cloudflare/workers-types"
-    ];
-    return json;
-  });
-}
-function addCloudflareFiles(tree, options) {
-  tree.delete(join(options.appProjectRoot, "src/main.ts"));
-  generateFiles(
-    tree,
-    join(__dirname, "./files/common"),
-    options.appProjectRoot,
-    {
-      ...options,
-      tmpl: "",
-      name: options.name,
-      accountId: options.accountId ? getAccountId(options.accountId) : "",
-      vitestScript: options.unitTestRunner === "vitest" ? vitestScript : ""
-    }
-  );
-  if (options.template && options.template !== "none") {
-    generateFiles(
-      tree,
-      join(__dirname, `./files/${options.template}`),
-      join(options.appProjectRoot, "src"),
-      {
-        ...options,
-        tmpl: "",
-        name: options.name,
-        accountId: options.accountId ? getAccountId(options.accountId) : "",
-        vitestScript: options.unitTestRunner === "vitest" ? vitestScript : "",
-        vitestImports: options.unitTestRunner === "vitest" ? vitestImports : ""
-      }
-    );
-  }
-}
-function addTargets(tree, options) {
-  try {
-    const projectConfiguration = readProjectConfiguration(tree, options.name);
-    projectConfiguration.targets = {
-      ...projectConfiguration.targets ?? {},
-      serve: {
-        executor: "@storm-software/cloudflare-tools:serve",
-        options: {
-          port: options.port
-        }
-      },
-      "nx-release-publish": {
-        executor: "@storm-software/cloudflare-tools:cloudflare-publish"
-      }
-    };
-    if (projectConfiguration.targets.build) {
-      delete projectConfiguration.targets.build;
-    }
-    updateProjectConfiguration(tree, options.name, projectConfiguration);
-  } catch (e) {
-    console.error(e);
-  }
-}
-function removeTestFiles(tree, options) {
-  tree.delete(join(options.appProjectRoot, "src", "index.test.ts"));
-}
-async function normalizeOptions(host, options, config) {
-  const { projectName: appProjectName, projectRoot: appProjectRoot } = await determineProjectNameAndRootOptions(host, {
-    name: options.name,
-    projectType: "application",
-    directory: options.directory,
-    rootProject: options.rootProject
-  });
-  options.rootProject = appProjectRoot === ".";
-  return {
-    addPlugin: process.env.NX_ADD_PLUGINS !== "false",
-    accountId: process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
-    ...options,
-    name: names(appProjectName).fileName,
-    frontendProject: options.frontendProject ? names(options.frontendProject).fileName : void 0,
-    appProjectRoot,
-    unitTestRunner: options.unitTestRunner ?? "vitest",
-    rootProject: options.rootProject ?? false,
-    template: options.template ?? "fetch-handler",
-    port: options.port ?? 3e3
-  };
-}
-var generator_default2 = applicationGenerator;
-var applicationSchematic = convertNxGenerator(applicationGenerator);
-
-export {
-  applicationGenerator,
-  generator_default2 as generator_default,
-  applicationSchematic
-};

package/dist/chunk-MAE2ZXHO.mjs

@@ -1,223 +0,0 @@
-import {
-  getInternalDependencies,
-  r2UploadFile
-} from "./chunk-5CMG7SUH.mjs";
-import {
-  createCliOptions,
-  getPackageInfo
-} from "./chunk-3MAI3FU2.mjs";
-import {
-  findWorkspaceRoot,
-  getConfig
-} from "./chunk-SGTAZO2Q.mjs";
-import {
-  correctPaths,
-  joinPaths,
-  writeDebug,
-  writeSuccess,
-  writeTrace,
-  writeWarning
-} from "./chunk-TPNHSNNZ.mjs";
-
-// src/executors/r2-upload-publish/executor.ts
-import { S3 } from "@aws-sdk/client-s3";
-import {
-  createProjectGraphAsync,
-  readCachedProjectGraph
-} from "@nx/devkit";
-import { glob } from "glob";
-import mime from "mime-types";
-import { execSync } from "node:child_process";
-import { readFile } from "node:fs/promises";
-async function runExecutor(options, context) {
-  const isDryRun = process.env.NX_DRY_RUN === "true" || options.dryRun || false;
-  if (!context.projectName) {
-    throw new Error("The executor requires a projectName.");
-  }
-  if (!options.path) {
-    throw new Error("The executor requires the `path` option to upload.");
-  }
-  console.info(
-    `\u{1F680}  Running Storm Cloudflare Publish executor on the ${context.projectName} worker`
-  );
-  if (!context.projectName || !context.projectsConfigurations?.projects || !context.projectsConfigurations.projects[context.projectName] || !context.projectsConfigurations.projects[context.projectName]?.root) {
-    throw new Error("The executor requires projectsConfigurations.");
-  }
-  try {
-    const workspaceRoot = findWorkspaceRoot();
-    const config = await getConfig(workspaceRoot);
-    const projectName = context.projectsConfigurations.projects[context.projectName]?.name ?? context.projectName;
-    const projectDetails = getPackageInfo(
-      context.projectsConfigurations.projects[context.projectName]
-    );
-    const bucketId = options.bucketId;
-    const bucketPath = options.bucketPath || "/";
-    if (!bucketId) {
-      throw new Error("The executor requires a bucketId.");
-    }
-    const args = createCliOptions({ ...options });
-    if (isDryRun) {
-      args.push("--dry-run");
-    }
-    const cloudflareAccountId = process.env.CLOUDFLARE_ACCOUNT_ID || process.env.STORM_BOT_CLOUDFLARE_ACCOUNT;
-    if (!options?.registry && !cloudflareAccountId) {
-      throw new Error(
-        "The registry option and `CLOUDFLARE_ACCOUNT_ID` (or `STORM_BOT_CLOUDFLARE_ACCOUNT`) environment variable are not set. Please set one of these values to upload to the Cloudflare R2 bucket."
-      );
-    }
-    if (!process.env.STORM_BOT_ACCESS_KEY_ID && !process.env.ACCESS_KEY_ID && !process.env.CLOUDFLARE_ACCESS_KEY_ID && !process.env.AWS_ACCESS_KEY_ID || !process.env.STORM_BOT_SECRET_ACCESS_KEY && !process.env.CLOUDFLARE_SECRET_ACCESS_KEY && !process.env.SECRET_ACCESS_KEY && !process.env.AWS_SECRET_ACCESS_KEY) {
-      throw new Error(
-        "The `ACCESS_KEY_ID` (or `STORM_BOT_ACCESS_KEY_ID`) and `SECRET_ACCESS_KEY` (or `STORM_BOT_SECRET_ACCESS_KEY`) environment variables are not set. Please set these environment variables to upload to the Cloudflare R2 bucket."
-      );
-    }
-    const registry = options?.registry ? options.registry : `https://${cloudflareAccountId}.r2.cloudflarestorage.com`;
-    let projectGraph;
-    try {
-      projectGraph = readCachedProjectGraph();
-    } catch {
-      await createProjectGraphAsync();
-      projectGraph = readCachedProjectGraph();
-    }
-    if (!projectGraph) {
-      throw new Error(
-        "The executor failed because the project graph is not available. Please run the build command again."
-      );
-    }
-    writeDebug(
-      `Publishing ${context.projectName} to the ${bucketId} R2 Bucket (at ${registry})`
-    );
-    const client = new S3({
-      region: "auto",
-      endpoint: registry,
-      credentials: {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        accessKeyId: process.env.STORM_BOT_ACCESS_KEY_ID || process.env.CLOUDFLARE_ACCESS_KEY_ID || process.env.AWS_ACCESS_KEY_ID || process.env.ACCESS_KEY_ID,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        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
-      }
-    });
-    const version = projectDetails?.content?.version;
-    if (version) {
-      writeDebug(`Starting upload version ${version}`);
-    }
-    const basePath = options.path;
-    const files = await glob(joinPaths(basePath, "**/*"), {
-      ignore: "**/{*.stories.tsx,*.stories.ts,*.spec.tsx,*.spec.ts}"
-    });
-    const internalDependencies = await getInternalDependencies(
-      context.projectName,
-      projectGraph
-    );
-    const dependencies = internalDependencies.filter(
-      (projectNode) => !projectNode.data.tags || projectNode.data.tags.every((tag) => tag.toLowerCase() !== "component")
-    ).reduce((ret, dep) => {
-      if (!ret[dep.name]) {
-        ret[dep.name] = "latest";
-      }
-      return ret;
-    }, projectDetails?.content.dependencies ?? {});
-    const release = options.tag ?? execSync("npm config get tag").toString().trim();
-    if (options.clean === true) {
-      writeDebug(`Clearing out existing items in ${bucketPath}`);
-      if (!isDryRun) {
-        const response = await client.listObjects({
-          Bucket: bucketId,
-          Prefix: bucketPath
-        });
-        if (response?.Contents && response.Contents.length > 0) {
-          writeTrace(
-            `Deleting the following existing items from the R2 bucket path ${bucketPath}: ${response.Contents.map((item) => item.Key).join(", ")}`
-          );
-          await Promise.all(
-            response.Contents.map(
-              (item) => client.deleteObjects({
-                Bucket: bucketId,
-                Delete: {
-                  Objects: [
-                    {
-                      Key: item.Key
-                    }
-                  ],
-                  Quiet: false
-                }
-              })
-            )
-          );
-        } else {
-          writeDebug(
-            `No existing items to delete in the R2 bucket path ${bucketPath}`
-          );
-        }
-      } else {
-        writeWarning("[Dry run]: Skipping R2 bucket clean.");
-      }
-    }
-    if (options.writeMetaJson === true) {
-      const meta = {
-        name: context.projectName,
-        version,
-        release,
-        description: projectDetails?.content?.description,
-        tags: projectDetails?.content?.keywords,
-        dependencies,
-        devDependencies: null,
-        internalDependencies: internalDependencies.filter(
-          (projectNode) => projectNode.data.tags && projectNode.data.tags.some(
-            (tag) => tag.toLowerCase() === "component"
-          )
-        ).map((dep) => dep.name)
-      };
-      if (projectDetails?.type === "package.json") {
-        meta.devDependencies = projectDetails?.content?.devDependencies;
-      }
-      const metaJson = JSON.stringify(meta);
-      writeTrace(`Generating meta.json file: 
-${metaJson}`);
-      await r2UploadFile(
-        client,
-        bucketId,
-        bucketPath,
-        "meta.json",
-        version,
-        metaJson,
-        "application/json",
-        isDryRun
-      );
-    }
-    await Promise.all(
-      files.map(async (file) => {
-        const name = correctPaths(file).replace(correctPaths(basePath), "");
-        const type = mime.lookup(name) || "application/octet-stream";
-        writeTrace(`Uploading file: ${name} (content-type: ${type})`);
-        await r2UploadFile(
-          client,
-          bucketId,
-          bucketPath,
-          name,
-          version,
-          await readFile(file, { encoding: "utf8" }),
-          type,
-          isDryRun
-        );
-      })
-    );
-    writeSuccess(
-      `Successfully uploaded the ${projectName} project to the Cloudflare R2 bucket.`,
-      config
-    );
-    return {
-      success: true
-    };
-  } catch (error) {
-    console.error("Failed to publish to Cloudflare R2 bucket");
-    console.error(error);
-    console.log("");
-    return {
-      success: false
-    };
-  }
-}
-
-export {
-  runExecutor
-};