@sentry/craft 2.24.1 → 2.24.2

package/dist/craft

@@ -157896,7 +157896,7 @@ var require_package6 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@sentry/craft",
-      version: "2.24.1",
+      version: "2.24.2",
       description: "The universal sentry workflow CLI",
       main: "dist/craft",
       repository: "https://github.com/getsentry/craft",
@@ -158000,7 +158000,8 @@ var require_package6 = __commonJS({
           "fast-xml-parser": "^5.3.4",
           minimatch: "^10.2.1",
           "ajv@<6.14.0": "^6.14.0",
-          rollup: "^4.59.0"
+          rollup: "^4.59.0",
+          flatted: "^3.4.0"
         }
       }
     };
@@ -158064,7 +158065,7 @@ function getPackage() {
 }
 function getPackageVersion() {
   const { version: version2 } = getPackage();
-  const buildInfo = "013a7b2113c2cac0ff32d5180cfeaefc7c9ce5b6";
+  const buildInfo = "78da70b88de5cf6245d5d7e3263a9e8952667dec";
   return buildInfo ? `${version2} (${buildInfo})` : version2;
 }
 function semVerToString(s6) {
@@ -165978,55 +165979,12 @@ __export(prepare_exports, {
 init_import_meta_url();
 var import_fs30 = require("fs");
 var import_path28 = require("path");
-init_dryRun();
 var shellQuote2 = __toESM(require_shell_quote());
+init_dryRun();
 init_config2();
 init_logger2();
 init_project_config();
-
-// src/utils/calver.ts
-init_import_meta_url();
-init_config2();
-init_logger2();
-var DEFAULT_CALVER_CONFIG = {
-  offset: 14,
-  format: "%y.%-m"
-};
-function formatCalVerDate(date2, format5) {
-  const year2 = date2.getFullYear();
-  const month = date2.getMonth() + 1;
-  const day = date2.getDate();
-  return format5.replace("%Y", String(year2)).replace("%y", String(year2).slice(-2)).replace("%-m", String(month)).replace("%m", String(month).padStart(2, "0")).replace("%-d", String(day)).replace("%d", String(day).padStart(2, "0"));
-}
-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}`);
-  const gitTagPrefix = getGitTagPrefix();
-  const searchPrefix = `${gitTagPrefix}${datePart}.`;
-  logger.debug(`CalVer: searching for tags with prefix: ${searchPrefix}`);
-  const tags = await git.tags();
-  let patch = 0;
-  for (const tag2 of tags.all) {
-    if (tag2.startsWith(searchPrefix)) {
-      const patchStr = tag2.slice(searchPrefix.length);
-      const patchNum = parseInt(patchStr, 10);
-      if (!isNaN(patchNum) && patchNum >= patch) {
-        patch = patchNum + 1;
-      }
-    }
-  }
-  const version2 = `${datePart}.${patch}`;
-  logger.info(`CalVer: determined version ${version2}`);
-  return version2;
-}
-
-// src/commands/prepare.ts
 init_async();
-init_changelog();
-init_errors2();
-init_git();
 
 // src/utils/autoVersion.ts
 init_import_meta_url();
@@ -166068,10 +166026,52 @@ function validateBumpType(result) {
   }
 }
 
+// src/utils/calver.ts
+init_import_meta_url();
+init_config2();
+init_logger2();
+var DEFAULT_CALVER_CONFIG = {
+  offset: 14,
+  format: "%y.%-m"
+};
+function formatCalVerDate(date2, format5) {
+  const year2 = date2.getFullYear();
+  const month = date2.getMonth() + 1;
+  const day = date2.getDate();
+  return format5.replace("%Y", String(year2)).replace("%y", String(year2).slice(-2)).replace("%-m", String(month)).replace("%m", String(month).padStart(2, "0")).replace("%-d", String(day)).replace("%d", String(day).padStart(2, "0"));
+}
+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}`);
+  const gitTagPrefix = getGitTagPrefix();
+  const searchPrefix = `${gitTagPrefix}${datePart}.`;
+  logger.debug(`CalVer: searching for tags with prefix: ${searchPrefix}`);
+  const tags = await git.tags();
+  let patch = 0;
+  for (const tag2 of tags.all) {
+    if (tag2.startsWith(searchPrefix)) {
+      const patchStr = tag2.slice(searchPrefix.length);
+      const patchNum = parseInt(patchStr, 10);
+      if (!isNaN(patchNum) && patchNum >= patch) {
+        patch = patchNum + 1;
+      }
+    }
+  }
+  const version2 = `${datePart}.${patch}`;
+  logger.info(`CalVer: determined version ${version2}`);
+  return version2;
+}
+
 // src/commands/prepare.ts
+init_changelog();
+init_errors2();
+init_git();
 init_helpers();
 init_strings();
 init_system();
+init_tracing3();
 init_version9();
 
 // src/utils/versionBump.ts
@@ -166124,9 +166124,6 @@ async function runAutomaticVersionBumps(targets, rootDir, newVersion) {
   return { anyBumped, bumpableTargets, skippedTargets };
 }
 
-// src/commands/prepare.ts
-init_tracing3();
-
 // src/commands/publish.ts
 var publish_exports = {};
 __export(publish_exports, {
@@ -166709,11 +166706,7 @@ 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...");
@@ -166758,15 +166751,10 @@ 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) {
@@ -166780,9 +166768,7 @@ 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 {
@@ -166802,15 +166788,11 @@ 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}".`);
@@ -166824,17 +166806,11 @@ 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;
@@ -166850,9 +166826,7 @@ 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);
@@ -166861,9 +166835,7 @@ 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);
@@ -166874,9 +166846,7 @@ 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 "";
     }
@@ -166929,7 +166899,7 @@ async function resolveVersion(git, options) {
         `CalVer versioning requires minVersion >= ${AUTO_VERSION_MIN_VERSION2} in .craft.yml. Please update your configuration or specify the version explicitly.`
       );
     }
-    const calverOffset = options.calverOffset ?? (process.env.CRAFT_CALVER_OFFSET ? parseInt(process.env.CRAFT_CALVER_OFFSET, 10) : void 0) ?? config3.versioning?.calver?.offset ?? DEFAULT_CALVER_CONFIG.offset;
+    const calverOffset = options.calverOffset ?? (process.env.CRAFT_CALVER_OFFSET ? Number.parseInt(process.env.CRAFT_CALVER_OFFSET, 10) : void 0) ?? config3.versioning?.calver?.offset ?? DEFAULT_CALVER_CONFIG.offset;
     const calverFormat = config3.versioning?.calver?.format ?? DEFAULT_CALVER_CONFIG.format;
     return calculateCalVer(git, {
       offset: calverOffset,
@@ -166952,11 +166922,9 @@ async function resolveVersion(git, options) {
     } else {
       bumpType = version2;
     }
-    const currentVersion = latestTag && latestTag.replace(/^v/, "").match(/^\d/) ? latestTag.replace(/^v/, "") : "0.0.0";
+    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;
@@ -166967,9 +166935,7 @@ 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(
@@ -167002,13 +166968,7 @@ 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;
@@ -167043,20 +167003,11 @@ 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}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/craft",
-  "version": "2.24.1",
+  "version": "2.24.2",
   "description": "The universal sentry workflow CLI",
   "main": "dist/craft",
   "repository": "https://github.com/getsentry/craft",
@@ -104,7 +104,8 @@
       "fast-xml-parser": "^5.3.4",
       "minimatch": "^10.2.1",
       "ajv@<6.14.0": "^6.14.0",
-      "rollup": "^4.59.0"
+      "rollup": "^4.59.0",
+      "flatted": "^3.4.0"
     }
   }
 }