@npmcli/template-oss 4.25.0 → 4.26.0

package/lib/config.js

@@ -129,6 +129,9 @@ const getFullConfig = async ({
 
   const esm = pkg.pkgJson?.type === 'module' || !!pkgConfig.typescript || !!pkgConfig.esm
 
+  // test runner configuration
+  const isNodeTest = pkgConfig.testRunner === 'node:test'
+
   // all derived keys
   const derived = {
     isRoot,
@@ -168,10 +171,12 @@ const getFullConfig = async ({
     esm,
     cjsExt: esm ? 'cjs' : 'js',
     deleteJsExt: esm ? 'js' : 'cjs',
+    // test runner
+    isNodeTest,
     // tap
     // 18 and up doesn't like nyc-arg
-    tap18: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major >= 18,
-    tap16: semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 16,
+    tap18: !isNodeTest && semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major >= 18,
+    tap16: !isNodeTest && semver.coerce(pkg.pkgJson?.devDependencies?.tap)?.major === 16,
     // booleans to control application of updates
     isForce,
     isDogFood,
@@ -202,6 +207,11 @@ const getFullConfig = async ({
     )
   }
 
+  // When using node:test, we don't need tap as a dependency
+  if (isNodeTest && Array.isArray(pkgConfig.requiredPackages?.devDependencies)) {
+    pkgConfig.requiredPackages.devDependencies = pkgConfig.requiredPackages.devDependencies.filter(p => p !== 'tap')
+  }
+
   pkgConfig.lintIgnorePaths = [
     ...(pkgConfig.ignorePaths || []),
     ...(pkgConfig.lintIgnorePaths || []),

package/lib/content/_step-test-yml.hbs

@@ -1,4 +1,15 @@
+{{#unless isNodeTest}}
 - name: Add Problem Matcher
   run: echo "::add-matcher::.github/matchers/tap.json"
+{{/unless}}
+{{#if isNodeTest}}
+- name: Test (with coverage on Node >= 24)
+  if: $\{{ fromJSON(matrix.node-version) >= 24 }}
+  run: {{ rootNpmPath }} run test:cover --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}
+- name: Test (without coverage on Node < 24)
+  if: $\{{ fromJSON(matrix.node-version) < 24 }}
+  run: {{ rootNpmPath }} test --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}
+{{else}}
 - name: Test
   run: {{ rootNpmPath }} test --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}
+{{/if}}

package/lib/content/index.js

@@ -37,7 +37,10 @@ const sharedRootAdd = name => ({
     filter: isPublic,
   },
   // ci
-  '.github/matchers/tap.json': 'tap-json.hbs',
+  '.github/matchers/tap.json': {
+    file: 'tap-json.hbs',
+    filter: p => !p.config.isNodeTest,
+  },
   [`.github/workflows/ci${name ? `-${name}` : ''}.yml`]: 'ci-yml.hbs',
   // dependabot
   '.github/dependabot.yml': {
@@ -185,6 +188,7 @@ module.exports = {
   publish: false,
   typescript: false,
   esm: false,
+  testRunner: 'tap',
   updateNpm: true,
   dependabot: 'increase-if-necessary',
   dependabotInterval: 'daily',

package/lib/content/package-json.hbs

@@ -17,8 +17,16 @@
     {{/if}}
     "postlint": "template-oss-check",
     "template-oss-apply": "template-oss-apply --force",
+    {{#if isNodeTest}}
+    "snap": "node --test --test-update-snapshots",
+    "test": "node --test --test-timeout=3000",
+    "test:cover": "node --test --experimental-test-coverage --test-timeout=3000 --test-coverage-lines=100 --test-coverage-functions=100 --test-coverage-branches=100",
+    {{else}}
     "snap": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
     "test": "{{#if typescript}}{{#if tap16}}c8 {{/if}}{{/if}}tap",
+    "test:cover": {{{ del }}},
+    "test:nocover": {{{ del }}},
+    {{/if}}
     "posttest": "{{ localNpmPath }} run lint",
     {{#if isRootMono}}
     "test-all": "{{ localNpmPath }} run test {{ allFlags }}",
@@ -40,6 +48,10 @@
   },
   "templateVersion": {{{ del }}},
   "standard": {{{ del }}},
+  {{#if isNodeTest}}
+  "nyc": {{{ del }}},
+  "tap": {{{ del }}}
+  {{else}}
   "nyc": {{#if tap18}}{
     "exclude": {{{ json workspaceGlobs }}}
   }{{else}}{{{ del }}}{{/if}},
@@ -78,4 +90,5 @@
       "tap-snapshots/**"
     ]{{/if}}
   }
+  {{/if}}
 }

package/lib/release/release-manager.js

@@ -1,15 +1,14 @@
-const { Octokit } = require('@octokit/rest')
 const core = require('@actions/core')
 const { join } = require('path')
 const semver = require('semver')
 const assert = require('assert')
 const dedent = require('dedent')
 const mapWorkspaces = require('@npmcli/map-workspaces')
-const { request: fetch } = require('undici')
 const { getPublishTag, block, noop } = require('./util')
 
 class ReleaseManager {
   #octokit
+  #token
   #owner
   #repo
   #cwd
@@ -28,7 +27,7 @@ class ReleaseManager {
     assert(pr, 'pr is required')
     assert(defaultTag, 'defaultTag is required')
 
-    this.#octokit = new Octokit({ auth: token })
+    this.#token = token
     this.#owner = repo.split('/')[0]
     this.#repo = repo.split('/')[1]
     this.#cwd = cwd
@@ -43,9 +42,15 @@ class ReleaseManager {
 
   static async run(options) {
     const manager = new ReleaseManager(options)
+    await manager.#init()
     return manager.run()
   }
 
+  async #init() {
+    const { Octokit } = await import('@octokit/rest')
+    this.#octokit = new Octokit({ auth: this.#token })
+  }
+
   async run() {
     const { data: pullRequest } = await this.#octokit.rest.pulls.get({
       owner: this.#owner,
@@ -168,15 +173,15 @@ class ReleaseManager {
       // up because that means something is very wrong. This is a rare edge
       // case that isn't worth testing.
 
-      if (r.statusCode === 200) {
+      if (r.status === 200) {
         this.#info('Found release process from wiki')
-        return r.body.text()
-      } else if (r.statusCode === 404) {
+        return r.text()
+      } else if (r.status === 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}`)
+        throw new Error(`Release process fetch failed with status: ${r.status}`)
       }
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/template-oss",
-  "version": "4.25.0",
+  "version": "4.26.0",
   "description": "templated files used in npm CLI team oss projects",
   "main": "lib/content/index.js",
   "bin": {
@@ -38,28 +38,27 @@
     "@commitlint/cli": "^19.0.3",
     "@commitlint/config-conventional": "^19.2.2",
     "@isaacs/string-locale-compare": "^1.1.0",
-    "@npmcli/arborist": "^7.2.1",
-    "@npmcli/git": "^6.0.0",
-    "@npmcli/map-workspaces": "^4.0.0",
-    "@npmcli/package-json": "^6.0.0",
-    "@octokit/rest": "^19.0.4",
+    "@npmcli/arborist": "^9.1.2",
+    "@npmcli/git": "^7.0.0",
+    "@npmcli/map-workspaces": "^5.0.0",
+    "@npmcli/package-json": "^7.0.0",
+    "@octokit/rest": "^22.0.0",
     "dedent": "^1.5.1",
-    "diff": "^7.0.0",
-    "glob": "^10.1.0",
+    "diff": "^8.0.2",
+    "glob": "^11.0.3",
     "handlebars": "^4.7.7",
-    "hosted-git-info": "^8.0.0",
+    "hosted-git-info": "^9.0.0",
     "ini": "^5.0.0",
     "json-parse-even-better-errors": "^4.0.0",
     "just-deep-map-values": "^1.1.1",
     "just-diff": "^6.0.0",
     "just-omit": "^2.2.0",
     "lodash": "^4.17.21",
-    "minimatch": "^9.0.2",
-    "npm-package-arg": "^12.0.0",
+    "minimatch": "^10.0.3",
+    "npm-package-arg": "^13.0.0",
     "proc-log": "^5.0.0",
-    "release-please": "16.15.0",
+    "release-please": "^17.1.1",
     "semver": "^7.3.5",
-    "undici": "^6.7.0",
     "yaml": "^2.1.1"
   },
   "files": [
@@ -71,15 +70,12 @@
     "@npmcli/eslint-config": "^5.0.0",
     "@npmcli/template-oss": "file:./",
     "eslint-config-prettier": "^9.1.0",
-    "nock": "^13.3.8",
+    "nock": "^14.0.6",
     "prettier": "^3.2.5",
     "tap": "^21.0.1"
   },
   "tap": {
     "timeout": 600,
-    "node-arg": [
-      "--no-experimental-fetch"
-    ],
     "exclude": [
       "workspace/test-workspace/**"
     ],