@sentry/craft 2.25.0 → 2.25.1

package/dist/craft

@@ -114423,7 +114423,11 @@ var init_docker = __esm({
     init_base5();
     DEFAULT_DOCKER_BIN = "docker";
     DOCKER_BIN = process.env.DOCKER_BIN || DEFAULT_DOCKER_BIN;
-    DOCKER_HUB_REGISTRIES = ["docker.io", "index.docker.io", "registry-1.docker.io"];
+    DOCKER_HUB_REGISTRIES = [
+      "docker.io",
+      "index.docker.io",
+      "registry-1.docker.io"
+    ];
     GCR_REGISTRY_PATTERNS = [
       /^gcr\.io$/,
       /^[a-z]+-gcr\.io$/,
@@ -114614,17 +114618,28 @@ Please use ${registryHint}DOCKER_USERNAME and DOCKER_PASSWORD environment variab
           return false;
         }
         if (!hasGcloudCredentials()) {
-          this.logger.debug("No gcloud credentials detected, skipping gcloud auth configure-docker");
+          this.logger.debug(
+            "No gcloud credentials detected, skipping gcloud auth configure-docker"
+          );
           return false;
         }
         if (!await isGcloudAvailable()) {
-          this.logger.debug("gcloud CLI not available, skipping gcloud auth configure-docker");
+          this.logger.debug(
+            "gcloud CLI not available, skipping gcloud auth configure-docker"
+          );
           return false;
         }
         const registryList = registries.join(",");
-        this.logger.debug(`Configuring Docker for Google Cloud registries: ${registryList}`);
+        this.logger.debug(
+          `Configuring Docker for Google Cloud registries: ${registryList}`
+        );
         try {
-          await spawnProcess("gcloud", ["auth", "configure-docker", registryList, "--quiet"], {}, {});
+          await spawnProcess(
+            "gcloud",
+            ["auth", "configure-docker", registryList, "--quiet"],
+            {},
+            {}
+          );
           this.logger.info(`Configured Docker authentication for: ${registryList}`);
           return true;
         } catch (error3) {
@@ -114665,7 +114680,9 @@ Please use ${registryHint}DOCKER_USERNAME and DOCKER_PASSWORD environment variab
           await this.loginToRegistry(source.credentials);
         } else if (sourceRegistry && !source.skipLogin && !gcrConfiguredRegistries.has(sourceRegistry) && // Don't warn if source and target share the same registry - target login will cover it
         sourceRegistry !== targetRegistry) {
-          this.logger.debug(`No credentials for source registry ${sourceRegistry}, assuming public`);
+          this.logger.debug(
+            `No credentials for source registry ${sourceRegistry}, assuming public`
+          );
         }
         if (target.credentials) {
           await this.loginToRegistry(target.credentials);
@@ -125210,24 +125227,22 @@ function castChecksums(checksums) {
       'Invalid type of "checksums": should be an array'
     );
   }
-  return checksums.map(
-    (item) => {
-      if (typeof item !== "object" || !item.algorithm || !item.format) {
-        throw new ConfigurationError(
-          `Invalid checksum type: ${JSON.stringify(item)}`
-        );
-      }
-      if (!Object.values(HashAlgorithm).includes(item.algorithm) || !Object.values(HashOutputFormat).includes(item.format)) {
-        throw new ConfigurationError(
-          `Invalid checksum type: ${JSON.stringify(item)}`
-        );
-      }
-      return {
-        algorithm: item.algorithm,
-        format: item.format
-      };
+  return checksums.map((item) => {
+    if (typeof item !== "object" || !item.algorithm || !item.format) {
+      throw new ConfigurationError(
+        `Invalid checksum type: ${JSON.stringify(item)}`
+      );
     }
-  );
+    if (!Object.values(HashAlgorithm).includes(item.algorithm) || !Object.values(HashOutputFormat).includes(item.format)) {
+      throw new ConfigurationError(
+        `Invalid checksum type: ${JSON.stringify(item)}`
+      );
+    }
+    return {
+      algorithm: item.algorithm,
+      format: item.format
+    };
+  });
 }
 async function getArtifactChecksums(checksums, artifact, artifactProvider) {
   const fileChecksums = {};
@@ -156223,7 +156238,9 @@ async function getRegionsFromAws() {
     path: "/?Action=DescribeRegions&Version=2013-10-15"
   });
   const url2 = `https://${hostname3}${path19}`;
-  const response = await (0, import_node_fetch4.default)(url2, { headers });
+  const response = await (0, import_node_fetch4.default)(url2, {
+    headers
+  });
   if (!response.ok) {
     throw new Error(
       `Unexpected HTTP response from ${url2}: ${response.status} (${response.statusText})`
@@ -159052,7 +159069,7 @@ var require_package6 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@sentry/craft",
-      version: "2.25.0",
+      version: "2.25.1",
       description: "The universal sentry workflow CLI",
       main: "dist/craft",
       repository: "https://github.com/getsentry/craft",
@@ -159134,6 +159151,8 @@ var require_package6 = __commonJS({
         clean: "rm -rf dist coverage",
         lint: "eslint --cache --cache-strategy content",
         fix: "pnpm lint --fix",
+        format: "prettier --write .",
+        "format:check": "prettier --check .",
         test: "vitest run",
         "test:watch": "vitest",
         typecheck: "tsc --noEmit",
@@ -159221,7 +159240,7 @@ function getPackage() {
 }
 function getPackageVersion() {
   const { version: version2 } = getPackage();
-  const buildInfo = "f4889d04564e47311038ecb6b910fef6b6cf1363";
+  const buildInfo = "14aca37e23aa6d8239a4013cae86d3bae4b4e0cd";
   return buildInfo ? `${version2} (${buildInfo})` : version2;
 }
 function semVerToString(s6) {
@@ -167200,7 +167219,9 @@ async function calculateCalVer(git, config3) {
   const date2 = /* @__PURE__ */ new Date();
   date2.setDate(date2.getDate() - config3.offset);
   const datePart = formatCalVerDate(date2, config3.format);
-  logger.debug(`CalVer: using date ${date2.toISOString()}, date part: ${datePart}`);
+  logger.debug(
+    `CalVer: using date ${date2.toISOString()}, date part: ${datePart}`
+  );
   const gitTagPrefix = getGitTagPrefix();
   const searchPrefix = `${gitTagPrefix}${datePart}.`;
   logger.debug(`CalVer: searching for tags with prefix: ${searchPrefix}`);
@@ -167897,15 +167918,30 @@ async function pushReleaseBranch(git, branchName, remoteName, pushFlag = true) {
     );
   }
 }
-async function commitNewVersion(git, newVersion) {
+async function commitChanges(git, newVersion, preReleaseCommandRan) {
   const message = `release: ${newVersion}`;
+  if (preReleaseCommandRan) {
+    const repoStatus2 = await git.status();
+    if (!(repoStatus2.created.length || repoStatus2.modified.length || repoStatus2.staged.length)) {
+      reportError(
+        "Nothing to commit: has the pre-release command done its job?"
+      );
+    }
+    logger.debug("Committing the release changes...");
+    logger.trace(`Commit message: "${message}"`);
+    await git.commit(message, ["--all"]);
+    return;
+  }
   const repoStatus = await git.status();
-  if (!(repoStatus.created.length || repoStatus.modified.length)) {
-    reportError("Nothing to commit: has the pre-release command done its job?");
+  if (!(repoStatus.staged.length || repoStatus.created.length)) {
+    logger.debug(
+      "Nothing to commit: no changelog changes and no version bumping occurred."
+    );
+    return;
   }
   logger.debug("Committing the release changes...");
   logger.trace(`Commit message: "${message}"`);
-  await git.commit(message, ["--all"]);
+  await git.commit(message);
 }
 async function runPreReleaseCommand(options) {
   const { oldVersion, newVersion, preReleaseCommand, targets, rootDir } = options;
@@ -167914,7 +167950,11 @@ async function runPreReleaseCommand(options) {
     return false;
   }
   if (preReleaseCommand) {
-    return runCustomPreReleaseCommand(oldVersion, newVersion, preReleaseCommand);
+    return runCustomPreReleaseCommand(
+      oldVersion,
+      newVersion,
+      preReleaseCommand
+    );
   }
   if (requiresMinVersion(AUTO_BUMP_MIN_VERSION) && targets && targets.length > 0) {
     logger.info("Running automatic version bumping from targets...");
@@ -167959,10 +167999,15 @@ function checkGitStatus(repoStatus, rev) {
   logger.info("Checking the local repository status...");
   logger.debug("Repository status:", formatJson(repoStatus));
   if (isRepoDirty(repoStatus)) {
-    reportError("Your repository is in a dirty state. Please stash or commit the pending changes.", logger);
+    reportError(
+      "Your repository is in a dirty state. Please stash or commit the pending changes.",
+      logger
+    );
   }
   if (repoStatus.current !== rev) {
-    logger.warn(`You are releasing from '${rev}', not '${repoStatus.current}' which you are currently on.`);
+    logger.warn(
+      `You are releasing from '${rev}', not '${repoStatus.current}' which you are currently on.`
+    );
   }
 }
 async function execPublish(remote, newVersion, noGitChecks) {
@@ -167976,7 +168021,9 @@ async function execPublish(remote, newVersion, noGitChecks) {
     noStatusCheck: false,
     noGitChecks
   };
-  logger.info(`Sleeping for ${SLEEP_BEFORE_PUBLISH_SECONDS} seconds before publishing...`);
+  logger.info(
+    `Sleeping for ${SLEEP_BEFORE_PUBLISH_SECONDS} seconds before publishing...`
+  );
   if (!isDryRun()) {
     await sleep(SLEEP_BEFORE_PUBLISH_SECONDS * 1e3);
   } else {
@@ -167996,11 +168043,15 @@ async function execPublish(remote, newVersion, noGitChecks) {
 }
 async function prepareChangelog(git, oldVersion, newVersion, changelogPolicy = "none" /* None */, changelogPath = DEFAULT_CHANGELOG_PATH) {
   if (changelogPolicy === "none" /* None */) {
-    logger.debug(`Changelog policy is set to "${changelogPolicy}", nothing to do.`);
+    logger.debug(
+      `Changelog policy is set to "${changelogPolicy}", nothing to do.`
+    );
     return void 0;
   }
   if (changelogPolicy !== "auto" /* Auto */ && changelogPolicy !== "simple" /* Simple */) {
-    throw new ConfigurationError(`Invalid changelog policy: "${changelogPolicy}"`);
+    throw new ConfigurationError(
+      `Invalid changelog policy: "${changelogPolicy}"`
+    );
   }
   logger.info("Checking the changelog...");
   logger.debug(`Changelog policy: "${changelogPolicy}".`);
@@ -168014,11 +168065,17 @@ async function prepareChangelog(git, oldVersion, newVersion, changelogPolicy = "
       logger.info(`Creating changelog file: ${relativePath}`);
       await safeFs.writeFile(relativePath, "# Changelog\n");
     } else {
-      throw new ConfigurationError(`Changelog does not exist: "${changelogPath}"`);
+      throw new ConfigurationError(
+        `Changelog does not exist: "${changelogPath}"`
+      );
     }
   }
   let changelogString = (await import_fs30.promises.readFile(relativePath)).toString();
-  let changeset = findChangeset(changelogString, newVersion, changelogPolicy === "auto" /* Auto */);
+  let changeset = findChangeset(
+    changelogString,
+    newVersion,
+    changelogPolicy === "auto" /* Auto */
+  );
   switch (changelogPolicy) {
     case "auto" /* Auto */:
       let replaceSection;
@@ -168034,7 +168091,9 @@ async function prepareChangelog(git, oldVersion, newVersion, changelogPolicy = "
         replaceSection = changeset.name;
         changeset.name = newVersion;
       }
-      logger.debug(`Updating the changelog file for the new version: ${newVersion}`);
+      logger.debug(
+        `Updating the changelog file for the new version: ${newVersion}`
+      );
       if (replaceSection) {
         changelogString = removeChangeset(changelogString, replaceSection);
         changelogString = prependChangeset(changelogString, changeset);
@@ -168043,7 +168102,9 @@ async function prepareChangelog(git, oldVersion, newVersion, changelogPolicy = "
       break;
     default:
       if (!changeset?.body) {
-        throw new ConfigurationError(`No changelog entry found for version "${newVersion}"`);
+        throw new ConfigurationError(
+          `No changelog entry found for version "${newVersion}"`
+        );
       }
   }
   logger.debug("Changelog entry found:", changeset.name);
@@ -168054,7 +168115,9 @@ async function getChangelogLineRange(git, changelogPath, version2) {
   try {
     const content = await git.show([`HEAD:${changelogPath}`]);
     const lines = content.split("\n");
-    const startIdx = lines.findIndex((l4) => l4.trimEnd() === `## ${version2}` || l4.trimEnd() === version2);
+    const startIdx = lines.findIndex(
+      (l4) => l4.trimEnd() === `## ${version2}` || l4.trimEnd() === version2
+    );
     if (startIdx < 0) {
       return "";
     }
@@ -168132,7 +168195,9 @@ async function resolveVersion(git, options) {
     }
     const currentVersion = latestTag && getVersion(latestTag) || "0.0.0";
     const newVersion = calculateNextVersion(currentVersion, bumpType);
-    logger.info(`Version bump: ${currentVersion} -> ${newVersion} (${bumpType} bump)`);
+    logger.info(
+      `Version bump: ${currentVersion} -> ${newVersion} (${bumpType} bump)`
+    );
     return newVersion;
   }
   return version2;
@@ -168143,7 +168208,9 @@ async function prepareMain(argv) {
     logger.info(`Loading configuration from remote branch: ${argv.configFrom}`);
     try {
       await git.fetch([argv.remote, argv.configFrom]);
-      const configContent = await git.show([`${argv.remote}/${argv.configFrom}:${CONFIG_FILE_NAME}`]);
+      const configContent = await git.show([
+        `${argv.remote}/${argv.configFrom}:${CONFIG_FILE_NAME}`
+      ]);
       loadConfigurationFromString(configContent);
     } catch (error3) {
       throw new ConfigurationError(
@@ -168176,7 +168243,13 @@ async function prepareMain(argv) {
   const isolation = await createDryRunIsolation(git, rev);
   git = isolation.git;
   try {
-    const branchName = await createReleaseBranch(git, rev, newVersion, argv.remote, config3.releaseBranchPrefix);
+    const branchName = await createReleaseBranch(
+      git,
+      rev,
+      newVersion,
+      argv.remote,
+      config3.releaseBranchPrefix
+    );
     const oldVersion = await getLatestTag(git);
     const changelogPath = typeof config3.changelog === "string" ? config3.changelog : config3.changelog?.filePath;
     const changelogPolicy = typeof config3.changelog === "object" && config3.changelog?.policy ? config3.changelog.policy : config3.changelogPolicy;
@@ -168187,6 +168260,13 @@ async function prepareMain(argv) {
       argv.noChangelog ? "none" /* None */ : changelogPolicy,
       changelogPath
     );
+    if (changelogBody) {
+      const resolvedChangelogPath = (0, import_path28.relative)(
+        "",
+        changelogPath || DEFAULT_CHANGELOG_PATH
+      );
+      await git.add(resolvedChangelogPath);
+    }
     const rootDir = getConfigFileDir() || process.cwd();
     const preReleaseCommandRan = await runPreReleaseCommand({
       oldVersion,
@@ -168195,11 +168275,7 @@ async function prepareMain(argv) {
       targets: config3.targets,
       rootDir
     });
-    if (preReleaseCommandRan) {
-      await commitNewVersion(git, newVersion);
-    } else {
-      logger.debug("Not committing anything since preReleaseCommand is empty.");
-    }
+    await commitChanges(git, newVersion, preReleaseCommandRan);
     await isolation.showDiff();
     await pushReleaseBranch(git, branchName, argv.remote, !argv.noPush);
     const releaseSha = await git.revparse(["HEAD"]);
@@ -168211,11 +168287,20 @@ async function prepareMain(argv) {
       const issueChangelog = isCalVer ? disableChangelogMentions(changelogBody) : changelogBody;
       writeGitHubActionsFile("changelog", issueChangelog);
       const resolvedChangelogPath = changelogPath || DEFAULT_CHANGELOG_PATH;
-      const lineRange = await getChangelogLineRange(git, resolvedChangelogPath, newVersion);
+      const lineRange = await getChangelogLineRange(
+        git,
+        resolvedChangelogPath,
+        newVersion
+      );
       const changelogFileUrl = `https://github.com/${githubConfig.owner}/${githubConfig.repo}/blob/${branchName}/${resolvedChangelogPath}` + lineRange;
-      setGitHubActionsOutput("changelog", truncateForOutput(issueChangelog, changelogFileUrl));
+      setGitHubActionsOutput(
+        "changelog",
+        truncateForOutput(issueChangelog, changelogFileUrl)
+      );
     }
-    logger.info(`View diff at: https://github.com/${githubConfig.owner}/${githubConfig.repo}/compare/${branchName}`);
+    logger.info(
+      `View diff at: https://github.com/${githubConfig.owner}/${githubConfig.repo}/compare/${branchName}`
+    );
     if (argv.publish) {
       if (isolation.isIsolated) {
         logger.info(`[dry-run] Would run: craft publish ${newVersion}`);
@@ -168372,10 +168457,13 @@ async function handlerMain(argv) {
     return void 0;
   }
   const filesToDownload = argv.all ? artifacts.map((ar2) => ar2.filename) : argv.names;
-  const nameToArtifact = artifacts.reduce((dict, artifact) => {
-    dict[artifact.filename] = artifact;
-    return dict;
-  }, {});
+  const nameToArtifact = artifacts.reduce(
+    (dict, artifact) => {
+      dict[artifact.filename] = artifact;
+      return dict;
+    },
+    {}
+  );
   logger.info(`Fetching artifacts for revision: ${revision}`);
   for (const name of filesToDownload) {
     logger.info(`Artifact to fetch: "${name}"`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/craft",
-  "version": "2.25.0",
+  "version": "2.25.1",
   "description": "The universal sentry workflow CLI",
   "main": "dist/craft",
   "repository": "https://github.com/getsentry/craft",
@@ -82,6 +82,8 @@
     "clean": "rm -rf dist coverage",
     "lint": "eslint --cache --cache-strategy content",
     "fix": "pnpm lint --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit",