@storm-software/cloudflare-tools 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.6.1 (2024-06-03)
+
+
+### 🩹 Fixes
+
+- **deps:** update patch prod dependencies ([072b4763](https://github.com/storm-software/storm-ops/commit/072b4763))
+
+- **deps:** update dependencies-non-major ([#181](https://github.com/storm-software/storm-ops/pull/181))
+
 ## 0.6.0 (2024-06-02)
 
 

package/index.js

@@ -66601,7 +66601,7 @@ var init_lib = __esm({
 });
 
 // packages/config/src/schema.ts
-var DarkColorSchema, LightColorSchema, BrandColorSchema, AccentColorSchema, HelpColorSchema, SuccessColorSchema, InfoColorSchema, WarningColorSchema, ErrorColorSchema, FatalColorSchema, DarkThemeColorConfigSchema, LightThemeColorConfigSchema, MultiThemeColorConfigSchema, SingleThemeColorConfigSchema, ColorConfigSchema, ColorConfigMapSchema, StormConfigSchema;
+var DarkColorSchema, LightColorSchema, BrandColorSchema, AccentColorSchema, HelpColorSchema, SuccessColorSchema, InfoColorSchema, WarningColorSchema, ErrorColorSchema, FatalColorSchema, DarkThemeColorConfigSchema, LightThemeColorConfigSchema, MultiThemeColorConfigSchema, SingleThemeColorConfigSchema, RegistryUrlConfigSchema, RegistryConfigSchema, ColorConfigSchema, ColorConfigMapSchema, StormConfigSchema;
 var init_schema = __esm({
   "packages/config/src/schema.ts"() {
     init_lib();
@@ -66655,6 +66655,13 @@ var init_schema = __esm({
       error: ErrorColorSchema,
       fatal: FatalColorSchema
     });
+    RegistryUrlConfigSchema = z2.string().trim().toLowerCase().url().optional().describe("A remote registry URL used to publish distributable packages");
+    RegistryConfigSchema = z2.object({
+      github: RegistryUrlConfigSchema,
+      npm: RegistryUrlConfigSchema,
+      cargo: RegistryUrlConfigSchema,
+      cyclone: RegistryUrlConfigSchema
+    }).describe("A list of remote registry URLs used by Storm Software");
     ColorConfigSchema = SingleThemeColorConfigSchema.or(
       MultiThemeColorConfigSchema
     ).describe("Colors used for various workspace elements");
@@ -66710,6 +66717,7 @@ var init_schema = __esm({
         "The log level used to filter out lower priority log messages. If not provided, this is defaulted using the `environment` config value (if `environment` is set to `production` then `level` is `error`, else `level` is `debug`)."
       ),
       cloudflareAccountId: z2.string().trim().toLowerCase().length(32).regex(/^([0-9a-fA-F]{32})$/i).nullable().default(null).describe("The default Cloudflare account ID of the workspace"),
+      registry: RegistryConfigSchema,
       configFile: z2.string().trim().nullable().default(null).describe(
         "The filepath of the Storm config. When this field is null, no config file was found in the current workspace."
       ),
@@ -68966,6 +68974,12 @@ var init_get_env = __esm({
         preid: process.env[`${prefix}PRE_ID`],
         externalPackagePatterns: process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`] ? JSON.parse(process.env[`${prefix}EXTERNAL_PACKAGE_PATTERNS`]) : [],
         cloudflareAccountId: process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] ? process.env[`${prefix}CLOUDFLARE_ACCOUNT_ID`] : process.env.CLOUDFLARE_ACCOUNT_ID ? process.env.CLOUDFLARE_ACCOUNT_ID : process.env.STORM_BOT_CLOUDFLARE_ACCOUNT,
+        registry: {
+          github: process.env[`${prefix}REGISTRY_GITHUB`],
+          npm: process.env[`${prefix}REGISTRY_NPM`],
+          cargo: process.env[`${prefix}REGISTRY_CARGO`],
+          cyclone: process.env[`${prefix}REGISTRY_CYCLONE`]
+        },
         logLevel: process.env[`${prefix}LOG_LEVEL`] !== null && process.env[`${prefix}LOG_LEVEL`] !== void 0 ? process.env[`${prefix}LOG_LEVEL`] && Number.isSafeInteger(
           Number.parseInt(process.env[`${prefix}LOG_LEVEL`])
         ) ? getLogLevelLabel(
@@ -69189,6 +69203,22 @@ var init_set_env = __esm({
           config.cloudflareAccountId
         );
       }
+      if (config.registry) {
+        if (config.registry.github) {
+          process.env[`${prefix}REGISTRY_GITHUB`] = String(config.registry.github);
+        }
+        if (config.registry.npm) {
+          process.env[`${prefix}REGISTRY_NPM`] = String(config.registry.npm);
+        }
+        if (config.registry.cargo) {
+          process.env[`${prefix}REGISTRY_CARGO`] = String(config.registry.cargo);
+        }
+        if (config.registry.cyclone) {
+          process.env[`${prefix}REGISTRY_CYCLONE`] = String(
+            config.registry.cyclone
+          );
+        }
+      }
       if (config.logLevel) {
         process.env[`${prefix}LOG_LEVEL`] = String(config.logLevel);
         process.env.LOG_LEVEL = String(config.logLevel);
@@ -400859,7 +400889,7 @@ var require_package8 = __commonJS({
   "packages/cloudflare-tools/package.json"(exports2, module2) {
     module2.exports = {
       name: "@storm-software/cloudflare-tools",
-      version: "0.6.0",
+      version: "0.6.1",
       private: false,
       description: "\u26A1The Storm-Ops monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.",
       keywords: [
@@ -552745,13 +552775,14 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
     switch (options.currentVersionResolver) {
       case "registry": {
         const metadata = options.currentVersionResolverMetadata;
-        const registry = metadata?.registry ?? await getNpmRegistry() ?? "https://registry.npmjs.org";
+        const npmRegistry = metadata?.registry ?? await getNpmRegistry();
+        const githubRegistry = metadata?.registry ?? await getGitHubRegistry();
         const tag = metadata?.tag ?? "latest";
         if (options.releaseGroup.projectsRelationship === "independent") {
           try {
             currentVersion = await new Promise((resolve3, reject) => {
               (0, import_node_child_process6.exec)(
-                `npm view ${packageName} version --registry=${registry} --tag=${tag}`,
+                `npm view ${packageName} version --registry=${npmRegistry} --tag=${tag}`,
                 (error, stdout, stderr) => {
                   if (error) {
                     return reject(error);
@@ -552764,19 +552795,39 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
               );
             });
             log(
-              `\u{1F4C4} Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${registry}`
+              `\u{1F4C4} Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${npmRegistry}`
             );
           } catch (_6) {
-            if (options.fallbackCurrentVersionResolver === "disk") {
+            try {
+              currentVersion = await new Promise((resolve3, reject) => {
+                (0, import_node_child_process6.exec)(
+                  `npm view ${packageName} version --registry=${githubRegistry} --tag=${tag}`,
+                  (error, stdout, stderr) => {
+                    if (error) {
+                      return reject(error);
+                    }
+                    if (stderr) {
+                      return reject(stderr);
+                    }
+                    return resolve3(stdout.trim());
+                  }
+                );
+              });
               log(
-                `\u{1F4C4} Unable to resolve the current version from the registry ${registry}. Falling back to the version on disk of ${currentVersionFromDisk}`
-              );
-              currentVersion = currentVersionFromDisk;
-              currentVersionResolvedFromFallback = true;
-            } else {
-              throw new Error(
-                `Unable to resolve the current version from the registry ${registry}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`
+                `\u{1F4C4} Resolved the current version as ${currentVersion} for tag "${tag}" from registry ${githubRegistry}`
               );
+            } catch (_7) {
+              if (options.fallbackCurrentVersionResolver === "disk") {
+                log(
+                  `\u{1F4C4} Unable to resolve the current version from the registry ${npmRegistry}${githubRegistry ? ` or ${githubRegistry}` : ""}. Falling back to the version on disk of ${currentVersionFromDisk}`
+                );
+                currentVersion = currentVersionFromDisk;
+                currentVersionResolvedFromFallback = true;
+              } else {
+                throw new Error(
+                  `Unable to resolve the current version from the registry ${npmRegistry}${githubRegistry ? ` or ${githubRegistry}` : ""}. Please ensure that the package exists in the registry in order to use the "registry" currentVersionResolver. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when the registry lookup fails.`
+                );
+              }
             }
           }
         } else {
@@ -552786,7 +552837,7 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
             );
           } else {
             log(
-              `\u{1F4C4} Using the current version ${currentVersion} already resolved from the registry ${registry}`
+              `\u{1F4C4} Using the current version ${currentVersion} already resolved from the registry ${npmRegistry ?? githubRegistry}`
             );
           }
         }
@@ -552811,17 +552862,18 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
             }
           );
           if (!latestMatchingGitTag) {
-            if (options.fallbackCurrentVersionResolver === "disk") {
+            if (currentVersionFromDisk) {
               log(
                 `\u{1F4C4} Unable to resolve the current version from git tag using pattern "${releaseTagPattern}". Falling back to the version on disk of ${currentVersionFromDisk}`
               );
               currentVersion = currentVersionFromDisk;
-              currentVersionResolvedFromFallback = true;
             } else {
-              throw new Error(
-                `No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. You will need to create an initial matching tag to use as a base for determining the next version. Alternatively, you can use the --first-release option or set "release.version.generatorOptions.fallbackCurrentVersionResolver" to "disk" in order to fallback to the version on disk when no matching git tags are found.`
+              log(
+                `No git tags matching pattern "${releaseTagPattern}" for project "${project.name}" were found. This process also could not determine the version by checking the package files on disk, so we will attempt to use the default version value: "0.0.1".`
               );
+              currentVersion = "0.0.1";
             }
+            currentVersionResolvedFromFallback = true;
           } else {
             currentVersion = latestMatchingGitTag.extractedVersion;
             log(
@@ -552859,13 +552911,14 @@ To fix this you will either need to add a package.json or Cargo.toml file at tha
             );
           }
           const affectedProjects = options.releaseGroup.projectsRelationship === "independent" ? [projectName] : projects.map((p2) => p2.name);
-          const previousVersionRef = latestMatchingGitTag ? latestMatchingGitTag.tag : options.fallbackCurrentVersionResolver === "disk" ? await (0, import_git.getFirstGitCommit)() : void 0;
+          let previousVersionRef = latestMatchingGitTag?.tag ? latestMatchingGitTag.tag : await (0, import_git.getFirstGitCommit)();
           if (!previousVersionRef) {
-            throw new Error(
+            log(
               `Unable to determine previous version ref for the projects ${affectedProjects.join(
                 ", "
-              )}. This is likely a bug in Nx.`
+              )}. This is likely a bug in Storm's Release Versioning. We will attempt to use the default version value "0.0.1" and continue with the process.`
             );
+            previousVersionRef = "0.0.1";
           }
           specifier = await (0, import_resolve_semver_specifier.resolveSemverSpecifierFromConventionalCommits)(
             previousVersionRef,
@@ -553116,7 +553169,10 @@ var generator_default4 = withRunGenerator(
   releaseVersionGeneratorFn
 );
 async function getNpmRegistry() {
-  return await new Promise((resolve3, reject) => {
+  if (process.env.STORM_REGISTRY_NPM) {
+    return process.env.STORM_REGISTRY_NPM;
+  }
+  const registry = await new Promise((resolve3, reject) => {
     (0, import_node_child_process6.exec)("npm config get registry", (error, stdout, stderr) => {
       if (error) {
         return reject(error);
@@ -553127,6 +553183,13 @@ async function getNpmRegistry() {
       return resolve3(stdout.trim());
     });
   });
+  return registry ? registry : "https://registry.npmjs.org";
+}
+function getGitHubRegistry() {
+  if (process.env.STORM_REGISTRY_GITHUB) {
+    return process.env.STORM_REGISTRY_GITHUB;
+  }
+  return "https://npm.pkg.github.com";
 }
 function hasGitDiff(filePath) {
   try {