@npmcli/template-oss 4.23.5 → 4.24.0

package/lib/content/package-json.hbs

@@ -40,13 +40,24 @@
   },
   "templateVersion": {{{ del }}},
   "standard": {{{ del }}},
+  "nyc": {{#if tap18}}{
+    "exclude": {{{ json workspaceGlobs }}}
+  }{{else}}{{{ del }}}{{/if}},
   "tap": {
+    {{#if tap18}}
+    {{#if workspaceGlobs}}
+    "exclude": {{{ json workspaceGlobs }}},
+    {{/if}}
+    "test-ignore": {{{ del }}},
+    {{else}}
+    "exclude": {{{ del }}},
     {{#if workspacePaths}}
       "exclude": {{#if tap18}}[
         "{{ join workspaceGlobs "," }}"
         ]{{else }}{{{ del }}}{{/if}},
       "test-ignore": {{#if tap18}}{{{ del }}}{{else}}"^({{ join workspacePaths "|" }})/"{{/if}},
     {{/if}}
+    {{/if}}
     {{#if typescript}}
     {{#if tap16}}
     "coverage": false,
@@ -57,6 +68,7 @@
     ],
     {{/if}}
     {{/if}}
+    "show-full-coverage": {{#if tap18}}true{{else}}{{{ del }}}{{/if}},
     "nyc-arg": {{#if tap18}}{{{ del }}}{{else}}[
       {{#each workspaceGlobs}}
       "--exclude",

package/lib/release/node-workspace-format.js

@@ -5,7 +5,8 @@ const { TagName } = require('release-please/build/src/util/tag-name.js')
 const { ROOT_PROJECT_PATH } = require('release-please/build/src/manifest.js')
 const { DEPS, link, wrapSpecs, list } = require('./util.js')
 
-/* istanbul ignore next: TODO fix flaky tests and enable coverage */
+/* TODO fix flaky tests and enable coverage */
+/* c8 ignore start */
 module.exports = class extends ManifestPlugin {
   static WORKSPACE_MESSAGE = (name, version) => `${DEPS}(workspace): ${name}@${version}`
 
@@ -95,3 +96,4 @@ module.exports = class extends ManifestPlugin {
     }
   }
 }
+/* c8 ignore end */

package/lib/release/release-manager.js

@@ -165,13 +165,14 @@ class ReleaseManager {
       // If the url fails with anything but a 404 we want the process to blow
       // up because that means something is very wrong. This is a rare edge
       // case that isn't worth testing.
-      /* istanbul ignore else */
+
       if (r.statusCode === 200) {
         this.#info('Found release process from wiki')
         return r.body.text()
       } else if (r.statusCode === 404) {
         this.#info('No release process found in wiki, falling back to default process')
         return this.#getReleaseSteps()
+        /* c8 ignore next 3 */
       } else {
         throw new Error(`Release process fetch failed with status: ${r.statusCode}`)
       }

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,8 +7,10 @@ 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 */
+/* TODO fix flaky tests and enable coverage */
+/* c8 ignore start */
 class ReleasePlease {
   #token
   #owner
@@ -52,9 +52,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 }) =>
@@ -166,5 +164,6 @@ class ReleasePlease {
     return releases.length ? releases : null
   }
 }
+/* c8 ignore end */
 
 module.exports = ReleasePlease

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

@@ -0,0 +1,71 @@
+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)
+    /* c8 ignore start */
+    if (!version) {
+      throw new Error('Could not bump version')
+    }
+    /* c8 ignore stop */
+    return Version.parse(version)
+  }
+}
+
+module.exports = { SemverVersioningStrategy }

package/lib/util/import-or-require.js

@@ -14,9 +14,18 @@ const importOrRequire = async path => {
   let content = {}
   try {
     content = require(path)
+    // this is for node 22+
+    /* c8 ignore start */
+    if (content.__esModule) {
+      return content.default
+    }
+    /* c8 ignore end */
   } catch {
     try {
-      content = await import(pathToFileURL(path)).then(r => r.default)
+      // this is for node under 20
+      const results = await import(pathToFileURL(path))
+      // istanbul ignore next
+      return results.default
     } catch {
       // its ok if this fails since the content dir might only be to provide
       // other files. the index.js is optional

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.23.5",
+  "version": "4.24.0",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -73,20 +73,17 @@
     "eslint-config-prettier": "^9.1.0",
     "nock": "^13.3.8",
     "prettier": "^3.2.5",
-    "tap": "^16.0.0"
+    "tap": "^21.0.1"
   },
   "tap": {
     "timeout": 600,
-    "nyc-arg": [
-      "--exclude",
-      "workspace/test-workspace/**",
-      "--exclude",
-      "tap-snapshots/**"
-    ],
-    "test-ignore": "^(workspace/test-workspace)/",
     "node-arg": [
       "--no-experimental-fetch"
-    ]
+    ],
+    "exclude": [
+      "workspace/test-workspace/**"
+    ],
+    "show-full-coverage": true
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
@@ -94,9 +91,14 @@
     "prettier": true
   },
   "engines": {
-    "node": "^18.17.0 || >=20.5.0"
+    "node": "^20.17.0 || >=22.9.0"
   },
   "workspaces": [
     "workspace/test-workspace"
-  ]
+  ],
+  "nyc": {
+    "exclude": [
+      "workspace/test-workspace/**"
+    ]
+  }
 }