@npmcli/template-oss 4.1.1 → 4.1.2

package/bin/release-please.js

@@ -20,6 +20,13 @@ const setOutput = (key, val) => {
           console.log(update.updater.changelogEntry)
           console.log('-'.repeat(40))
         }
+        for (const update of val.updates.filter(u => u.updater.rawContent)) {
+          console.log('package:', update.path)
+          console.log('-'.repeat(40))
+          console.log(JSON.parse(update.updater.rawContent).name)
+          console.log(JSON.parse(update.updater.rawContent).version)
+          console.log('-'.repeat(40))
+        }
       }
     } else {
       core.setOutput(key, JSON.stringify(val))

package/lib/release-please/github.js

@@ -10,35 +10,39 @@ module.exports = (gh) => {
       return response
     }
 
-    const { repository } = await gh.graphql(
-      `fragment CommitAuthors on GitObject {
-        ... on Commit {
-          authors (first:10) {
-            nodes {
-              user { login }
-              name
+    try {
+      const { repository } = await gh.graphql(
+        `fragment CommitAuthors on GitObject {
+          ... on Commit {
+            authors (first:10) {
+              nodes {
+                user { login }
+                name
+              }
             }
           }
         }
-      }
-      query {
-        repository (owner:"${owner}", name:"${repo}") {
-          ${shas.map((s) => {
-            return `_${s}: object (expression: "${s}") { ...CommitAuthors }`
-          })}
+        query {
+          repository (owner:"${owner}", name:"${repo}") {
+            ${shas.map((s) => {
+              return `_${s}: object (expression: "${s}") { ...CommitAuthors }`
+            })}
+          }
+        }`
+      )
+
+      for (const [key, commit] of Object.entries(repository)) {
+        if (commit) {
+          response[key.slice(1)] = commit.authors.nodes
+            .map((a) => a.user && a.user.login ? `@${a.user.login}` : a.name)
+            .filter(Boolean)
         }
-      }`
-    )
-
-    for (const [key, commit] of Object.entries(repository)) {
-      if (commit) {
-        response[key.slice(1)] = commit.authors.nodes
-          .map((a) => a.user && a.user.login ? `@${a.user.login}` : a.name)
-          .filter(Boolean)
       }
-    }
 
-    return response
+      return response
+    } catch {
+      return response
+    }
   }
 
   const url = (...p) => `https://github.com/${owner}/${repo}/${p.join('/')}`

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

@@ -1,3 +1,4 @@
+const localeCompare = require('@isaacs/string-locale-compare')('en')
 const { NodeWorkspace } = require('release-please/build/src/plugins/node-workspace.js')
 const { RawContent } = require('release-please/build/src/updaters/raw-content.js')
 const { jsonStringify } = require('release-please/build/src/util/json-stringify.js')
@@ -105,9 +106,11 @@ module.exports = class extends NodeWorkspace {
   // except it only updates the package.json instead of appending
   // anything to changelogs since we've already done that in preconfigure.
   updateCandidate (candidate, pkg, updatedVersions) {
+    const newVersion = updatedVersions.get(pkg.name)
     const graphPackage = this.packageGraph.get(pkg.name)
-    const updatedPackage = pkg.clone()
 
+    const updatedPackage = pkg.clone()
+    updatedPackage.version = newVersion.toString()
     for (const [depName, resolved] of graphPackage.localDependencies) {
       const depVersion = updatedVersions.get(depName)
       if (depVersion && resolved.type !== 'directory') {
@@ -160,10 +163,13 @@ module.exports = class extends NodeWorkspace {
         if (aPath === ROOT_PROJECT_PATH) {
           return -1
         }
+        // release please pre sorts based on graph order so
+        // this is never called in normal circumstances
+        /* istanbul ignore next */
         if (bPath === ROOT_PROJECT_PATH) {
           return 1
         }
-        return 0
+        return localeCompare(aPath, bPath)
       })
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -32,6 +32,7 @@
     "@actions/core": "^1.9.1",
     "@commitlint/cli": "^17.1.1",
     "@commitlint/config-conventional": "^17.1.0",
+    "@isaacs/string-locale-compare": "^1.1.0",
     "@npmcli/fs": "^2.0.1",
     "@npmcli/git": "^3.0.0",
     "@npmcli/map-workspaces": "^2.0.2",