@npmcli/template-oss 4.23.4 → 4.23.6

package/lib/content/release-please-config-json.hbs

@@ -10,7 +10,7 @@
   "group-pull-request-title-pattern": "chore: release ${version}",
   "pull-request-title-pattern": "chore: release${component} ${version}",
   "changelog-sections": {{{ json changelogTypes }}},
-  "prerelease-type": "pre",
+  "prerelease-type": "pre.0",
   "packages": {
     "{{ pkgPath }}": {
       {{#if isRoot}}

package/lib/release/release-please.js

@@ -1,6 +1,4 @@
 const RP = require('release-please')
-const { DefaultVersioningStrategy } = require('release-please/build/src/versioning-strategies/default.js')
-const { PrereleaseVersioningStrategy } = require('release-please/build/src/versioning-strategies/prerelease.js')
 const { ROOT_PROJECT_PATH } = require('release-please/build/src/manifest.js')
 const { CheckpointLogger, logger } = require('release-please/build/src/util/logger.js')
 const assert = require('assert')
@@ -9,6 +7,7 @@ const omit = require('just-omit')
 const ChangelogNotes = require('./changelog.js')
 const NodeWorkspaceFormat = require('./node-workspace-format.js')
 const { getPublishTag, noop } = require('./util.js')
+const { SemverVersioningStrategy } = require('./semver-versioning-strategy.js')
 
 /* istanbul ignore next: TODO fix flaky tests and enable coverage */
 class ReleasePlease {
@@ -52,9 +51,7 @@ class ReleasePlease {
 
   async init() {
     RP.registerChangelogNotes('default', ({ github, ...o }) => new ChangelogNotes(github, o))
-    RP.registerVersioningStrategy('default', o =>
-      o.prerelease ? new PrereleaseVersioningStrategy(o) : new DefaultVersioningStrategy(o),
-    )
+    RP.registerVersioningStrategy('default', o => new SemverVersioningStrategy(o))
     RP.registerPlugin(
       'node-workspace-format',
       ({ github, targetBranch, repositoryConfig, ...o }) =>

package/lib/release/semver-versioning-strategy.js

@@ -0,0 +1,70 @@
+const semver = require('semver')
+const { Version } = require('release-please/build/src/version.js')
+
+const inc = (version, release, _preid) => {
+  const parsed = new semver.SemVer(version)
+  const implicitPreid = parsed.prerelease.length > 1 ? parsed.prerelease[0]?.toString() : undefined
+  const preid = _preid || implicitPreid
+  const next = new semver.SemVer(version).inc(release, preid)
+  if (!parsed.prerelease.length) {
+    return next.format()
+  }
+  const isFreshMajor = parsed.minor === 0 && parsed.patch === 0
+  const isFreshMinor = parsed.patch === 0
+  const shouldPrerelease =
+    (release === 'premajor' && isFreshMajor) || (release === 'preminor' && isFreshMinor) || release === 'prepatch'
+  if (shouldPrerelease) {
+    return semver.inc(version, 'prerelease', preid)
+  }
+  return next.format()
+}
+
+const parseCommits = commits => {
+  let release = 'patch'
+  for (const commit of commits) {
+    if (commit.breaking) {
+      release = 'major'
+      break
+    } else if (['feat', 'feature'].includes(commit.type)) {
+      release = 'minor'
+    }
+  }
+  return release
+}
+
+class SemverVersioningStrategyNested {
+  constructor(options, version, commits) {
+    this.options = options
+    this.commits = commits
+    this.version = version
+  }
+
+  bump() {
+    return new SemverVersioningStrategy(this.options).bump(this.version, this.commits)
+  }
+}
+
+class SemverVersioningStrategy {
+  constructor(options) {
+    this.options = options
+  }
+
+  determineReleaseType(version, commits) {
+    return new SemverVersioningStrategyNested(this.options, version, commits)
+  }
+
+  bump(currentVersion, commits) {
+    const prerelease = this.options.prerelease
+    const tag = this.options.prereleaseType
+    const releaseType = parseCommits(commits)
+    const addPreIfNeeded = prerelease ? `pre${releaseType}` : releaseType
+    const version = inc(currentVersion.toString(), addPreIfNeeded, tag)
+    /* istanbul ignore next */
+    if (!version) {
+      throw new Error('Could not bump version')
+    }
+    return Version.parse(version)
+  }
+}
+
+module.exports = { SemverVersioningStrategy }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.23.4",
+  "version": "4.23.6",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -44,7 +44,7 @@
     "@npmcli/package-json": "^6.0.0",
     "@octokit/rest": "^19.0.4",
     "dedent": "^1.5.1",
-    "diff": "^6.0.0",
+    "diff": "^7.0.0",
     "glob": "^10.1.0",
     "handlebars": "^4.7.7",
     "hosted-git-info": "^8.0.0",
@@ -57,7 +57,7 @@
     "minimatch": "^9.0.2",
     "npm-package-arg": "^12.0.0",
     "proc-log": "^5.0.0",
-    "release-please": "16.13.0",
+    "release-please": "16.15.0",
     "semver": "^7.3.5",
     "undici": "^6.7.0",
     "yaml": "^2.1.1"