@npmcli/template-oss 4.12.0 → 4.13.0

package/bin/release-manager.js

@@ -17,14 +17,14 @@ const args = process.argv.slice(2).reduce((acc, a) => {
 }, {})
 
 /* eslint-disable max-len */
-const DEFAULT_RELEASE_PROCESS = `
+const MANUAL_PUBLISH_STEPS = `
 1. Checkout the release branch and test
 
     \`\`\`sh
     gh pr checkout <PR-NUMBER> --force
     npm ${args.lockfile ? 'ci' : 'update'}
     npm test
-    gh pr checks --watch
+    gh pr checks <PR-NUMBER> -R {NWO} --watch
     \`\`\`
 
 1. Publish workspaces
@@ -42,12 +42,22 @@ const DEFAULT_RELEASE_PROCESS = `
 1. Merge release PR
 
     \`\`\`sh
-    gh pr merge --rebase
+    gh pr merge <PR-NUMBER> -R {NWO} --rebase
     git checkout <BASE-BRANCH>
     git fetch
     git reset --hard origin/<BASE-BRANCH>
     \`\`\`
+`
 
+const AUTO_PUBLISH_STEPS = `
+1. Merge release PR :rotating_light: Merging this will auto publish :rotating_light:
+
+    \`\`\`sh
+    gh pr merge <PR-NUMBER> -R {NWO} --rebase
+    \`\`\`
+`
+
+const DEFAULT_RELEASE_PROCESS = (args.publish ? AUTO_PUBLISH_STEPS : MANUAL_PUBLISH_STEPS) + `
 1. Check For Release Tags
 
     Release Please will run on the just pushed release commit and create GitHub releases and tags for each package.
@@ -55,7 +65,8 @@ const DEFAULT_RELEASE_PROCESS = `
     \`\`\`
     gh run watch \`gh run list -R {NWO} -w release -b <BASE-BRANCH> -L 1 --json databaseId -q ".[0].databaseId"\`
     \`\`\`
-` /* eslint-enable max-len */
+`
+/* eslint-enable max-len */
 
 const getReleaseProcess = async ({ owner, repo }) => {
   const RELEASE_LIST_ITEM = /^\d+\.\s/gm

package/lib/content/_job-release-integration.yml

@@ -1,3 +1,28 @@
+{{#if publish}}
+runs-on: ubuntu-latest
+defaults:
+  run:
+    shell: bash
+permissions:
+  deployments: write
+steps:
+  - name: Checkout
+    uses: actions/checkout@v3
+    with:
+      ref: $\{{ fromJSON(needs.release.outputs.release).tagName }}
+  - name: Setup Node
+    uses: actions/setup-node@v3
+    with:
+      node-version: 18.x
+  - name: Install npm@latest
+    run: |
+      npm i --prefer-online --no-fund --no-audit -g npm@latest
+      npm config set '//registry.npmjs.org/:_authToken'=\${PUBLISH_TOKEN}
+  - name: Publish
+    env:
+      PUBLISH_TOKEN: $\{{ secrets.PUBLISH_TOKEN }}
+    run: npm publish
+{{else}}
 runs-on: ubuntu-latest
 defaults:
   run:
@@ -30,3 +55,4 @@ steps:
       done
 
       exit $EXIT_CODE
+{{/if}}

package/lib/content/index.js

@@ -151,6 +151,7 @@ module.exports = {
   ciVersions: ['14.17.0', '14.x', '16.13.0', '16.x', '18.0.0', '18.x'],
   lockfile: false,
   codeowner: '@npm/cli-team',
+  publish: false,
   npm: 'npm',
   npx: 'npx',
   npmSpec: 'latest',

package/lib/content/release.yml

@@ -85,7 +85,7 @@ jobs:
           RELEASE_COMMENT_ID: $\{{ needs.release.outputs.comment-id }}
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
         run: |
-          {{ rootNpmPath }} exec --offline -- template-oss-release-manager --lockfile={{ lockfile }}
+          {{ rootNpmPath }} exec --offline -- template-oss-release-manager --lockfile={{ lockfile }} --publish={{ publish }}
           {{ rootNpmPath }} run rp-pull-request --ignore-scripts {{~#if allFlags}} {{ allFlags }}{{else}} --if-present{{/if}}
       - name: Commit
         id: commit

package/lib/util/files.js

@@ -1,9 +1,8 @@
 const { join } = require('path')
 const { defaultsDeep } = require('lodash')
-const { promisify } = require('util')
 const merge = require('./merge.js')
 const deepMapValues = require('just-deep-map-values')
-const glob = promisify(require('glob'))
+const glob = require('glob')
 const Parser = require('./parser.js')
 const template = require('./template.js')
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -42,13 +42,13 @@
     "@npmcli/package-json": "^3.0.0",
     "@octokit/rest": "^19.0.4",
     "diff": "^5.0.0",
-    "glob": "^8.0.1",
+    "glob": "^9.3.1",
     "handlebars": "^4.7.7",
     "hosted-git-info": "^6.0.0",
-    "ini": "^3.0.1",
+    "ini": "^4.0.0",
     "json-parse-even-better-errors": "^3.0.0",
     "just-deep-map-values": "^1.1.1",
-    "just-diff": "^5.0.1",
+    "just-diff": "^6.0.0",
     "lodash": "^4.17.21",
     "npm-package-arg": "^10.0.0",
     "proc-log": "^3.0.0",
@@ -76,7 +76,8 @@
     "test-ignore": "^(workspace/test-workspace)/"
   },
   "templateOSS": {
-    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten."
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "publish": true
   },
   "engines": {
     "node": "^14.17.0 || ^16.13.0 || >=18.0.0"