@npmcli/template-oss 4.21.1 → 4.21.3

package/lib/content/dependabot-yml.hbs

@@ -21,4 +21,5 @@ updates:
       {{#each labels }}
       - "{{ . }}"
       {{/each}}
+    open-pull-requests-limit: 10
   {{/each}}

package/lib/content/index.js

@@ -203,6 +203,6 @@ module.exports = {
     { type: 'fix', section: 'Bug Fixes', hidden: false, collapse: false },
     { type: 'docs', section: 'Documentation', hidden: false, collapse: false },
     { type: 'deps', section: 'Dependencies', hidden: false, collapse: false },
-    { type: 'chore', section: 'Chores', hidden: false, collapse: true },
+    { type: 'chore', section: 'Chores', hidden: false, collapse: false },
   ],
 }

package/lib/release/changelog.js

@@ -31,6 +31,8 @@ class Changelog {
   #getEntries (type) {
     const section = this.#sections[type]
     const entries = this.#entries[type].map(list)
+    // Ignoring coverage until we use this again
+    /* istanbul ignore next */
     if (section?.collapse) {
       entries.unshift('<details><summary>Commits</summary>\n')
       entries.push('\n</details>')

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

@@ -5,14 +5,13 @@ 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 } = require('./util.js')
 
-const WORKSPACE_MESSAGE = (name, version) => `${DEPS}(workspace): ${name}@${version}`
-const WORKSPACE_SCOPE = /(?<scope>workspace): `?(?<name>\S+?)[@\s](?<version>\S+?)`?$/gm
-
+/* istanbul ignore next: TODO fix flaky tests and enable coverage */
 module.exports = class extends ManifestPlugin {
-  static WORKSPACE_MESSAGE = WORKSPACE_MESSAGE
+  static WORKSPACE_MESSAGE = (name, version) => `${DEPS}(workspace): ${name}@${version}`
 
   #releasesByPackage = new Map()
   #pathsByComponent = new Map()
+  #WORKSPACE_SCOPE = /(?<scope>workspace): `?(?<name>\S+?)[@\s](?<version>\S+?)`?$/gm
 
   async preconfigure (strategiesByPath) {
     // First build a list of all releases that will happen based on
@@ -44,7 +43,7 @@ module.exports = class extends ManifestPlugin {
         // Update notes with a link to each workspaces release notes
         // now that we have all of the releases in a single pull request
         release.notes =
-          release.notes.replace(WORKSPACE_SCOPE, (...args) => {
+          release.notes.replace(this.#WORKSPACE_SCOPE, (...args) => {
             const { scope, name, version } = args.pop()
             const { path, component } = this.#releasesByPackage.get(name)
             const { tagSeparator, includeVInTag } = this.repositoryConfig[path]
@@ -54,28 +53,6 @@ module.exports = class extends ManifestPlugin {
             return `${link(scope, url)}: ${wrapSpecs(`${name}@${version}`)}`
           })
 
-        // remove the other release please dependencies list which always starts with
-        // the following line and then each line is indented. so we search for the line
-        // and remove and indented lines until the next non indented line.
-        let foundRemoveStart = false
-        let foundRemoveEnd = false
-        release.notes = release.notes
-          .split('\n')
-          .filter((line) => {
-            if (line === '* The following workspace dependencies were updated') {
-              foundRemoveStart = true
-            } else if (foundRemoveStart && !foundRemoveEnd) {
-              // TODO: test when inserted dependencies is not the last thing in the changelog
-              /* istanbul ignore next */
-              if (!line || !line.startsWith(' ')) {
-                foundRemoveEnd = true
-              }
-            }
-            // If we found the start, remove all lines until we've found the end
-            return foundRemoveStart ? foundRemoveEnd : true
-          })
-          .join('\n')
-
         // Find the associated changelog and update that too
         const path = this.#pathsByComponent.get(release.component)
         for (const update of candidate.pullRequest.updates) {

package/lib/release/node-workspace.js

@@ -10,7 +10,15 @@ const { WORKSPACE_MESSAGE } = require('./node-workspace-format')
 // not be easy to land. For now we extend the base plugin and add one method
 // which is much better than previously when we needed to fork and maintain
 // release-please ourselves.
+/* istanbul ignore next: TODO fix flaky tests and enable coverage */
 class NpmNodeWorkspace extends NodeWorkspace {
+  updateCandidate (pr) {
+    // no-op so release-please node-workspace plugin does not add
+    // its broken changelog to the workspace releases. our changelog
+    // formatting and the preconfigure method below fix this.
+    return pr
+  }
+
   async preconfigure (strategiesByPath, commitsByPath, releasesByPath) {
     // First build a list of all releases that will happen based on the
     // conventional commits

package/lib/release/release-please.js

@@ -15,6 +15,7 @@ const NodeWorkspace = require('./node-workspace.js')
 const NodeWorkspaceFormat = require('./node-workspace-format.js')
 const { getPublishTag, noop } = require('./util.js')
 
+/* istanbul ignore next: TODO fix flaky tests and enable coverage */
 class ReleasePlease {
   #token
   #owner

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.21.1",
+  "version": "4.21.3",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {