@npmcli/template-oss 4.22.0 → 4.23.1

package/lib/content/action-create-check-yml.hbs

@@ -23,7 +23,7 @@ runs:
       with:
         result-encoding: string
         script: |
-          const { repo: { owner, repo}, runId, serverUrl } = context          
+          const { repo: { owner, repo}, runId, serverUrl } = context
           const { JOB_NAME, SHA } = process.env
 
           const job = await github.rest.actions.listJobsForWorkflowRun({

package/lib/content/action-install-latest-npm-yml.hbs

@@ -42,7 +42,7 @@ runs:
             MATCH=$SPEC
             echo "Found compatible version: npm@$MATCH"
             break
-          fi  
+          fi
         done
 
         if [ -z $MATCH ]; then

package/lib/content/ci-release-yml.hbs

@@ -27,7 +27,7 @@ jobs:
       {{> stepLintYml jobRunFlags=allFlags }}
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.6.0
-        if: always()
+        if: steps.create-check.outputs.check-id && always()
         with:
           token: $\{{ secrets.GITHUB_TOKEN }}
           conclusion: $\{{ job.status }}
@@ -42,7 +42,7 @@ jobs:
       {{> stepTestYml jobRunFlags=allFlags }}
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.6.0
-        if: always()
+        if: steps.create-check.outputs.check-id && always()
         with:
           token: $\{{ secrets.GITHUB_TOKEN }}
           conclusion: $\{{ job.status }}

package/lib/content/eslintrc-js.hbs

@@ -9,13 +9,9 @@ const localConfigs = readdir(__dirname)
 module.exports = {
   root: true,
   ignorePatterns: [
-    'tap-testdir*/',
-    {{#each workspaceGlobs}}
+    {{#each lintIgnorePaths}}
     '{{ . }}',
     {{/each}}
-    {{#if typescript}}
-    'dist/',
-    {{/if}}
   ],
   {{#if typescript}}
   parser: '@typescript-eslint/parser',
@@ -28,5 +24,8 @@ module.exports = {
   extends: [
     '@npmcli',
     ...localConfigs,
+    {{#if prettier}}
+    'prettier',
+    {{/if}}
   ],
 }

package/lib/content/gitignore.hbs

@@ -1,9 +1,6 @@
 # ignore everything in the root
 /*
-# transient test directories
-tap-testdir*/
 
-# keep these
 {{#each ignorePaths}}
 {{ . }}
 {{/each}}

package/lib/content/index.js

@@ -1,8 +1,8 @@
 const { name: NAME, version: LATEST_VERSION } = require('../../package.json')
 
-const isPublic = (p) => p.config.isPublic
+const isPublic = p => p.config.isPublic
 
-const sharedRootAdd = (name) => ({
+const sharedRootAdd = name => ({
   // release
   '.github/workflows/release.yml': {
     file: 'release-yml.hbs',
@@ -19,17 +19,17 @@ const sharedRootAdd = (name) => ({
   '.release-please-manifest.json': {
     file: 'release-please-manifest-json.hbs',
     filter: isPublic,
-    parser: (p) => p.JsonMergeNoComment,
+    parser: p => p.JsonMergeNoComment,
   },
   'release-please-config.json': {
     file: 'release-please-config-json.hbs',
     filter: isPublic,
-    parser: (p) => p.JsonMergeNoComment,
+    parser: p => p.JsonMergeNoComment,
   },
   'tsconfig.json': {
     file: 'tsconfig-json.hbs',
-    filter: (p) => p.config.typescript,
-    parser: (p) => p.JsonMergeNoComment,
+    filter: p => p.config.typescript,
+    parser: p => p.JsonMergeNoComment,
   },
   // this lint commits which is only necessary for releases
   '.github/workflows/pull-request.yml': {
@@ -42,15 +42,15 @@ const sharedRootAdd = (name) => ({
   // dependabot
   '.github/dependabot.yml': {
     file: 'dependabot-yml.hbs',
-    filter: (p) => p.config.dependabot,
+    filter: p => p.config.dependabot,
   },
   '.github/workflows/post-dependabot.yml': {
     file: 'post-dependabot-yml.hbs',
-    filter: (p) => p.config.dependabot,
+    filter: p => p.config.dependabot,
   },
   '.github/settings.yml': {
     file: 'settings-yml.hbs',
-    filter: (p) => !p.config.isReleaseBranch,
+    filter: p => !p.config.isReleaseBranch,
   },
   // composite actions
   '.github/actions/install-latest-npm/action.yml': 'action-install-latest-npm-yml.hbs',
@@ -59,10 +59,10 @@ const sharedRootAdd = (name) => ({
 
 const sharedRootRm = () => ({
   '.github/workflows/pull-request.yml': {
-    filter: (p) => p.config.allPrivate,
+    filter: p => p.config.allPrivate,
   },
   '.github/settings.yml': {
-    filter: (p) => p.config.isReleaseBranch,
+    filter: p => p.config.isReleaseBranch,
   },
 })
 
@@ -94,7 +94,15 @@ const rootModule = {
   add: {
     '.eslintrc.{{ cjsExt }}': {
       file: 'eslintrc-js.hbs',
-      filter: (p) => p.config.eslint,
+      filter: p => p.config.eslint,
+    },
+    '.prettierrc.{{ cjsExt }}': {
+      file: 'prettier-js.hbs',
+      filter: p => p.config.prettier,
+    },
+    '.prettierignore': {
+      file: 'prettierignore.hbs',
+      filter: p => p.config.prettier,
     },
     '.gitignore': 'gitignore.hbs',
     '.npmrc': 'npmrc.hbs',
@@ -103,9 +111,7 @@ const rootModule = {
     'CONTRIBUTING.md': 'CONTRIBUTING-md.hbs',
     'package.json': 'package-json.hbs',
   },
-  rm: [
-    '.eslintrc.!({{ cjsExt }}|local.*)',
-  ],
+  rm: ['.eslintrc.!({{ cjsExt }}|local.*)'],
 }
 
 // Changes for each workspace but applied to the root of the repo
@@ -125,16 +131,12 @@ const workspaceModule = {
   add: {
     '.eslintrc.{{ cjsExt }}': {
       file: 'eslintrc-js.hbs',
-      filter: (p) => p.config.eslint,
+      filter: p => p.config.eslint,
     },
     '.gitignore': 'gitignore.hbs',
     'package.json': 'package-json.hbs',
   },
-  rm: [
-    '.npmrc',
-    '.eslintrc.!({{ cjsExt }}|local.*)',
-    'SECURITY.md',
-  ],
+  rm: ['.npmrc', '.eslintrc.!({{ cjsExt }}|local.*)', 'SECURITY.md'],
 }
 
 module.exports = {
@@ -151,10 +153,7 @@ module.exports = {
   // {{major}} to have the major version being published replaced in the string.
   defaultPublishTag: 'latest',
   releaseBranch: 'release/v*',
-  distPaths: [
-    'bin/',
-    'lib/',
-  ],
+  distPaths: ['bin/', 'lib/'],
   allowDistPaths: true,
   allowPaths: [
     '/.eslintrc.local.*',
@@ -167,15 +166,21 @@ module.exports = {
     '/README*',
     '/LICENSE*',
     '/CHANGELOG*',
+    '/.git-blame-ignore-revs',
   ],
-  ignorePaths: [
-    /* to be provided by consuming package */
+  ignorePaths: ['tap-testdir*/'],
+  lintIgnorePaths: [
+    // can be set by consumer
   ],
+  lintExtensions: ['js', 'cjs', 'ts', 'mjs', 'jsx', 'tsx'],
+  formatIgnorePaths: ['tap-snapshots/', 'test/fixtures/**/*.json'],
+  formatExtensions: ['js', 'cjs', 'ts', 'mjs', 'jsx', 'tsx', 'json'],
   ciVersions: {},
   latestCiVersion: 22,
   lockfile: false,
   codeowner: '@npm/cli-team',
   eslint: true,
+  prettier: false,
   publish: false,
   typescript: false,
   esm: false,
@@ -191,11 +196,7 @@ module.exports = {
     'standard',
   ],
   requiredPackages: {
-    devDependencies: [
-      `${NAME}@${LATEST_VERSION}`,
-      '@npmcli/eslint-config',
-      'tap',
-    ],
+    devDependencies: [`${NAME}@${LATEST_VERSION}`, '@npmcli/eslint-config', 'tap'],
   },
   allowedPackages: [],
   changelogTypes: [

package/lib/content/package-json.hbs

@@ -3,10 +3,20 @@
   "files": {{{ json distPaths }}},
   "type": {{#if esm}}"module"{{else}}{{{ del }}}{{/if}},
   "scripts": {
-    "lint": "{{#if eslint}}eslint \"**/*.{js,cjs,ts,mjs,jsx,tsx}\"{{else}}echo linting disabled{{/if}}",
+    {{#if eslint}}
+    "eslint": "eslint \"**/*.{{{ extGlob lintExtensions }}}\"",
+    "lint": "{{ localNpmPath }} run eslint {{~#if prettier}} && {{ localNpmPath }} run prettier -- --check{{/if}}",
+    "lintfix": "{{ localNpmPath }} run eslint -- --fix {{~#if prettier}} && {{ localNpmPath }} run prettier -- --write{{/if}}",
+    {{#if prettier}}
+    "prettier": "prettier \"**/*.{{{ extGlob formatExtensions }}}\"",
+    {{/if}}
+    {{else}}
+    "eslint": {{{ del }}},
+    "lint": "echo linting disabled",
+    "lintfix": {{{ del }}},
+    {{/if}}
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
-    "lintfix": "{{ localNpmPath }} run lint -- --fix",
     "snap": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
     "test": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
     "posttest": "{{ localNpmPath }} run lint",

package/lib/content/post-dependabot-yml.hbs

@@ -26,7 +26,7 @@ jobs:
         id: flags
         run: |
           dependabot_dir="$\{{ steps.metadata.outputs.directory }}"
-          if [[ "$dependabot_dir" == "/" ]]; then
+          if [[ "$dependabot_dir" == "/" || "$dependabot_dir" == "/{{ releaseBranch }}" ]]; then
             echo "workspace=-iwr" >> $GITHUB_OUTPUT
           else
             # strip leading slash from directory so it works as a
@@ -64,7 +64,7 @@ jobs:
         run: |
           git commit -am "$\{{ steps.apply.outputs.message }}"
           git push
-      
+
       # If the previous step failed, then reset the commit and remove any workflow changes
       # and attempt to commit and push again. This is helpful because we will have a commit
       # with the correct prefix that we can then --amend with @npmcli/stafftools later.
@@ -98,4 +98,3 @@ jobs:
           echo "This PR has a breaking change. Run 'npx -p @npmcli/stafftools gh template-oss-fix'"
           echo "for more information on how to fix this with a BREAKING CHANGE footer."
           exit 1
-          

package/lib/content/prettier-js.hbs

@@ -0,0 +1,6 @@
+const githubConfig = require('@github/prettier-config')
+
+module.exports = {
+  ...githubConfig,
+  bracketSpacing: true,
+}

package/lib/content/prettierignore.hbs

@@ -0,0 +1,3 @@
+{{#each formatIgnorePaths}}
+{{ . }}
+{{/each}}

package/lib/index.js

@@ -4,7 +4,7 @@ const getConfig = require('./config.js')
 const PackageJson = require('@npmcli/package-json')
 const mapWorkspaces = require('@npmcli/map-workspaces')
 
-const getPkg = async (path) => {
+const getPkg = async path => {
   log.verbose('get-pkg', path)
 
   const pkgJson = (await PackageJson.load(path)).content
@@ -27,7 +27,7 @@ const getWsPkgs = async (root, rootPkg) => {
 
   // Include all by default
   const { workspaces } = rootPkg.config
-  const include = (name) => Array.isArray(workspaces) ? workspaces.includes(name) : true
+  const include = name => (Array.isArray(workspaces) ? workspaces.includes(name) : true)
 
   // Look through all workspaces on the root pkg
   const rootWorkspaces = await mapWorkspaces({ pkg: rootPkg.pkgJson, cwd: root })
@@ -43,7 +43,7 @@ const getWsPkgs = async (root, rootPkg) => {
   return wsPkgs
 }
 
-const getPkgs = async (root) => {
+const getPkgs = async root => {
   log.verbose('get-pkgs', 'root', root)
 
   const rootPkg = await getPkg(root)

package/lib/release/changelog.js

@@ -11,7 +11,7 @@ class Changelog {
     [Changelog.BREAKING]: '⚠️ BREAKING CHANGES',
   }
 
-  constructor ({ version, url, sections }) {
+  constructor({ version, url, sections }) {
     this.#title = `## ${url ? link(version, url) : version} (${formatDate()})`
     for (const section of sections) {
       this.#types.add(section.type)
@@ -20,7 +20,7 @@ class Changelog {
     }
   }
 
-  add (type, ...entries) {
+  add(type, ...entries) {
     if (!this.#types.has(type) || !entries.length) {
       return
     }
@@ -28,11 +28,11 @@ class Changelog {
     this.#entries[type].push(...entries)
   }
 
-  #getEntries (type) {
+  #getEntries(type) {
     return this.#entries[type].map(list).join('\n')
   }
 
-  toString () {
+  toString() {
     const body = [this.#title]
     const includedTypes = []
 
@@ -47,7 +47,7 @@ class Changelog {
     // empty string which will skip the release PR being created.
     // We do this because we don't want PRs opened if they only contain
     // chores but we do want to rebuild existing PRs if chores are added.
-    if (includedTypes.every((type) => this.#sections[type]?.hidden)) {
+    if (includedTypes.every(type => this.#sections[type]?.hidden)) {
       return ''
     }
 
@@ -62,7 +62,7 @@ class ChangelogNotes {
   #graphql
   #ghUrl
 
-  constructor (github) {
+  constructor(github) {
     this.#owner = github.repository.owner
     this.#repo = github.repository.repo
     this.#rest = github.octokit.rest
@@ -70,7 +70,7 @@ class ChangelogNotes {
     this.#ghUrl = makeGitHubUrl(this.#owner, this.#repo)
   }
 
-  async #getAuthorsForCommits (commits) {
+  async #getAuthorsForCommits(commits) {
     const shas = commits
       .filter(c => c.type !== 'deps')
       .map(c => c.sha)
@@ -82,7 +82,7 @@ class ChangelogNotes {
 
     const authorsByCommit = {}
     const { repository } = await this.#graphql(
-        `fragment CommitAuthors on GitObject {
+      `fragment CommitAuthors on GitObject {
           ... on Commit {
             authors (first:10) {
               nodes {
@@ -94,23 +94,23 @@ class ChangelogNotes {
         }
         query {
           repository (owner:"${this.#owner}", name:"${this.#repo}") {
-            ${shas.map((s) => {
+            ${shas.map(s => {
               return `_${s}: object (expression: "${s}") { ...CommitAuthors }`
             })}
           }
-        }`
+        }`,
     )
     for (const [key, commit] of Object.entries(repository)) {
       if (commit) {
         authorsByCommit[key.slice(1)] = commit.authors.nodes
-          .map((a) => a.user && a.user.login ? `@${a.user.login}` : a.name)
+          .map(a => (a.user && a.user.login ? `@${a.user.login}` : a.name))
           .filter(Boolean)
       }
     }
     return authorsByCommit
   }
 
-  async #getPullRequestNumbersForCommits (commits) {
+  async #getPullRequestNumbersForCommits(commits) {
     const shas = commits
       .filter(c => !c.pullRequest?.number)
       .map(c => c.sha)
@@ -122,19 +122,20 @@ class ChangelogNotes {
 
     const pullRequestsByCommit = {}
     for (const sha of shas) {
-      pullRequestsByCommit[sha] = await this.#rest.repos.listPullRequestsAssociatedWithCommit({
-        owner: this.#owner,
-        repo: this.#repo,
-        commit_sha: sha,
-        per_page: 1,
-      })
-        .then((r) => r.data[0].number)
+      pullRequestsByCommit[sha] = await this.#rest.repos
+        .listPullRequestsAssociatedWithCommit({
+          owner: this.#owner,
+          repo: this.#repo,
+          commit_sha: sha,
+          per_page: 1,
+        })
+        .then(r => r.data[0].number)
         .catch(() => null)
     }
     return pullRequestsByCommit
   }
 
-  #buildEntry (commit) {
+  #buildEntry(commit) {
     const entry = []
 
     if (commit.sha) {
@@ -161,7 +162,7 @@ class ChangelogNotes {
     return entry.join(' ')
   }
 
-  #filterCommits (commits) {
+  #filterCommits(commits) {
     const filteredCommits = []
     const keyedDuplicates = {}
 
@@ -186,8 +187,8 @@ class ChangelogNotes {
     // Sort all our duplicates so we get the latest verion (by PR number) of each type.
     // Then flatten so we can put them all back into the changelog
     const sortedDupes = Object.values(keyedDuplicates)
-      .filter((items) => Boolean(items.length))
-      .map((items) => items.sort((a, b) => b.pullRequestNumber - a.pullRequestNumber))
+      .filter(items => Boolean(items.length))
+      .map(items => items.sort((a, b) => b.pullRequestNumber - a.pullRequestNumber))
       .flatMap(items => items[0])
 
     // This moves them to the bottom of their changelog section which is not
@@ -199,7 +200,7 @@ class ChangelogNotes {
     return filteredCommits
   }
 
-  async buildNotes (rawCommits, { version, previousTag, currentTag, changelogSections }) {
+  async buildNotes(rawCommits, { version, previousTag, currentTag, changelogSections }) {
     // get authors for commits for each sha
     const authors = await this.#getAuthorsForCommits(rawCommits)
 
@@ -208,7 +209,7 @@ class ChangelogNotes {
     // lookup commits without a pr number and find one if it exists
     const prNumbers = await this.#getPullRequestNumbersForCommits(rawCommits)
 
-    const fullCommits = rawCommits.map((commit) => {
+    const fullCommits = rawCommits.map(commit => {
       commit.authors = authors[commit.sha] ?? []
       commit.pullRequestNumber = Number(commit.pullRequest?.number ?? prNumbers[commit.sha])
       return commit
@@ -216,9 +217,7 @@ class ChangelogNotes {
 
     const changelog = new Changelog({
       version,
-      url: previousTag
-        ? this.#ghUrl('compare', `${previousTag.toString()}...${currentTag.toString()}`)
-        : null,
+      url: previousTag ? this.#ghUrl('compare', `${previousTag.toString()}...${currentTag.toString()}`) : null,
       sections: changelogSections,
     })
 
@@ -227,9 +226,7 @@ class ChangelogNotes {
       changelog.add(commit.type, this.#buildEntry(commit))
 
       // And breaking changes to its own section
-      changelog.add(Changelog.BREAKING, ...commit.notes
-        .filter(n => n.title === 'BREAKING CHANGE')
-        .map(n => n.text))
+      changelog.add(Changelog.BREAKING, ...commit.notes.filter(n => n.title === 'BREAKING CHANGE').map(n => n.text))
     }
 
     return changelog.toString()

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

@@ -12,7 +12,7 @@ module.exports = class extends ManifestPlugin {
   #releasesByPackage = new Map()
   #pathsByComponent = new Map()
 
-  async preconfigure (strategiesByPath) {
+  async preconfigure(strategiesByPath) {
     // First build a list of all releases that will happen based on
     // the conventional commits
     for (const path in strategiesByPath) {
@@ -25,17 +25,19 @@ module.exports = class extends ManifestPlugin {
     return strategiesByPath
   }
 
-  run (candidates) {
+  run(candidates) {
     this.#rewriteWorkspaceChangelogItems(candidates)
     this.#sortReleases(candidates)
     return candidates
   }
 
-  #replaceWorkspace ({ name, versionRange }) {
+  #replaceWorkspace({ name, versionRange }) {
     const version = versionRange.replace(/^[\^~]/, '')
     const { path, component } = this.#releasesByPackage.get(name)
     const { tagSeparator, includeVInTag } = this.repositoryConfig[path]
-    const { repository: { owner, repo } } = this.github
+    const {
+      repository: { owner, repo },
+    } = this.github
     const tag = new TagName(version, component, tagSeparator, includeVInTag).toString()
     const url = `https://github.com/${owner}/${repo}/releases/tag/${tag}`
     return list(`${link('workspace', url)}: ${wrapSpecs(`${name}@${version}`)}`)
@@ -46,7 +48,7 @@ module.exports = class extends ManifestPlugin {
   // be part of the changelog plugin since they are written after that by the
   // node-workspace plugin. A possible PR to release-please could add an option
   // to customize these or run them through the changelog notes generator.
-  #rewriteWorkspaceChangelogItems (candidates) {
+  #rewriteWorkspaceChangelogItems(candidates) {
     for (const candidate of candidates) {
       for (const release of candidate.pullRequest.body.releaseData) {
         // Update notes with a link to each workspaces release notes
@@ -57,13 +59,11 @@ module.exports = class extends ManifestPlugin {
           .replace(/^\s{2}\* devDependencies\n/gm, '')
           .replace(/^\s{2}\* peerDependencies\n/gm, '')
           .replace(/^\s{2}\* optionalDependencies\n/gm, '')
-          .replace(
-            /^\s{4}\* (?<name>[^\s]+) bumped to (?<versionRange>[^\s]+)/gm,
-            (...args) => this.#replaceWorkspace(args.at(-1))
+          .replace(/^\s{4}\* (?<name>[^\s]+) bumped to (?<versionRange>[^\s]+)/gm, (...args) =>
+            this.#replaceWorkspace(args.at(-1)),
           )
-          .replace(
-            /^\s{4}\* (?<name>[^\s]+) bumped from (?:[^\s]+) to (?<versionRange>[^\s]+)/gm,
-            (...args) => this.#replaceWorkspace(args.at(-1))
+          .replace(/^\s{4}\* (?<name>[^\s]+) bumped from (?:[^\s]+) to (?<versionRange>[^\s]+)/gm, (...args) =>
+            this.#replaceWorkspace(args.at(-1)),
           )
 
         // Find the associated changelog and update that too
@@ -79,7 +79,7 @@ module.exports = class extends ManifestPlugin {
 
   // Sort root release to the top of the pull request
   // release please pre sorts based on graph order so
-  #sortReleases (candidates) {
+  #sortReleases(candidates) {
     for (const candidate of candidates) {
       candidate.pullRequest.body.releaseData.sort((a, b) => {
         const aPath = this.#pathsByComponent.get(a.component)